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

Conflicts:
	css/new.css