Minor changes
Merge branch 'master' of https://github.com/buffaloproject1/BuffaloProjectWebsite

Conflicts:
	js/profile/name/model/nameModel.js