Merge branch 'master' of git://github.com/MoSync/Reload into reload-311

Conflicts:
	ReloadClient/LoginScreen.cpp
Merge pull request #119 from endesigner/reload-311

Reload 311