Merge branch 'newstyles'

Conflicts:
	cloudcms/templates/cms/base.html

diff --combined cloudcms/templates/cms/base.html
index e657d47,3f7d614..3bd1911
--- 1/cloudcms/templates/cms/base.html
--- 2/cloudcms/templates/cms/base.html
+++ b/cloudcms/templates/cms/base.html
@@@ -15,7 -15,8 +15,8 @@@
    {% endblock favicons %}
  
    {% block css %}
-       <link href='https://fonts.googleapis.com/css?family=Didact+Gothic&subset=latin' rel='stylesheet' type='text/css'>
+       
+       <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,600,700&subset=latin,greek-ext,greek' rel='stylesheet' type='text/css'>
        <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}cloudcms/css/global.css">
        <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}cloudcms/css/print.css" media="print">
        <!--[if lte IE 7]>
@@@ -27,6 -28,7 +28,6 @@@
    {% endblock css %}
  
    {% block headjs %}
 -     
        <script src="{{ MEDIA_URL }}cloudcms/js/jquery-1.7.1.min.js"></script>
        <script src="{{ MEDIA_URL }}cloudcms/js/underscore.js"></script>
        <script src="{{ MEDIA_URL }}cloudcms/js/jquery.infieldlabel.js"></script>
@@@ -71,19 -73,7 +72,19 @@@
      {% block page.mainbody %}
       
      <div class="container">
 -      <div class="wrapper">
 +        <div class="wrapper">
 +
 +            {% if messages %}
 +            <div class="top-msg active info">
 +                {% for message in messages %}
 +                <div class="msg {% if message.tags %}{{ message.tags }}{% endif %}">
 +                    {{ message }}
 +                </div>
 +                {% endfor %}
 +                <a href="#" title="close" class="close">X</a>
 +            </div>
 +            {% endif %}
 +    
                <div class="mainlogo">
                        {% if APP.logo %}
                                <h1>
@@@ -123,6 -113,16 +124,6 @@@
                </div>
            </div>    
      </div>
 -    {% if messages %}
 -    <ul class="messages">
 -        {% for message in messages %}
 -        <li{% if message.tags %}
 -            class="{{ message.tags }}"{% endif %}>
 -            {{ message }}</li>
 -        {% endfor %}
 -    </ul>
 -    {% endif %}
 -    
      
      <div class="footer">
          <div class="wrapper">