Merge remote-tracking branch 'upstream/master'

Conflicts:
	Controller/AppController.php
	Controller/UsersController.php
	Model/User.php
Merge branch 'master' of https://github.com/NgrNxk/phtagr

Conflicts:
	Controller/AppController.php
	Controller/UsersController.php
	Model/User.php