123
1234
Merge branch 'master' of https://github.com/qshen1989/NexusApp

Conflicts:
	Resources/ui/common/HomeView.js