Merge errors fixed
Merge branch 'events' of http://github.com/ShaastraWebops/Shaastra-2013-Website into events