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

Conflicts:
css/shanti-main.css
popover resolving conflict
popover resolve conflict
resolving conflict, removed popover css temporarily