files name
Merge branch 'master' of https://github.com/steven-/MvcTemplate

Conflicts:
	all-messages.html
	all-users.html
	see-profile.html