temp commit
Merge branch 'master' of https://github.com/harshadsph/utsav_singapore_2013

Conflicts:
	sites/default/files/styles/gallery_custom_thumbnail/public/aurora.jpg