1:43 AM
Merge branch 'master' of https://github.com/qshen1989/NexusApp

Conflicts:
	Resources/ui/common/FriendsView.js