Possibly broke everything. If not - new Application paradigm.
Merge remote-tracking branch 'origin/master'

Conflicts:
	User.php