no message
Merge branch 'master' of https://github.com/LevEngIntern2014/TeamB

Conflicts:
	app/View/Users/view.ctp
Merge branch 'master' of https://github.com/LevEngIntern2014/TeamB
no message