My
Merge branch 'master' of https://github.com/zuochi/YearBook.git

Conflicts:
	WebRoot/js/User_index.js
M