Revert "Stuck here for tonight"

This reverts commit e72c74996f626f0caf0daf3a9e0e61f97103541c.
Merge branch 'master' of https://github.com/wlouthe/491

c74996f626f0caf0daf3a9e0e61f97103541c.

Conflicts:
	SiteFiles/Flash/src/common/main.as
	SiteFiles/Flash/voicechat.swf
Revert "Revert "Stuck here for tonight""

This reverts commit 249e3b1170964c0e125d1bc5ef7f2375a9e76fc8.