Merge branch 'master' of https://github.com/NgrNxk/phtagr

reverted to upstream/master
	Controller/*Controller.php
	Model/User.php
Merge branch 'master' of https://github.com/NgrNxk/phtagr