Some changes

I don't know wat these are and wen did they happen...
Merge remote-tracking branch 'origin/master'

Conflicts:
	Shaastra.v12.suo
	Shaastra/Bin/Debug/Shaastra.dll
	Shaastra/Bin/Debug/Shaastra.pdb
	Shaastra/Bin/Debug/Shaastra_Debug_AnyCPU.xap
	Shaastra/obj/Debug/Shaastra.dll
	Shaastra/obj/Debug/Shaastra.pdb
	Shaastra/obj/Debug/Shows/shows.g.cs
	Shaastra/obj/Debug/Shows/shows.g.i.cs
	Shaastra/obj/Debug/XapCacheFile.xml