Merge branch 'master' of https://github.com/shanti-uva/drupal_shanti_theme

Conflicts:
css/main.css
templates/html.tpl.php