6:27PM
Merge branch 'master' of https://github.com/qshen1989/NexusApp

Conflicts:
	Resources/logic/HttpConnection.js