window fix
Merge branch 'master' of https://github.com/siddharthbhargava/ChatoverCloud

Conflicts:
	UI/User.html