user view page
Merge branch 'master' of https://github.com/mohr24/musicinsanity into Tianming

Conflicts:
	.idea/workspace.xml