Simplify the base User class.

Signed-off-by: crynobone <crynobone@gmail.com>
Simplify the base User class.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2

Signed-off-by: crynobone <crynobone@gmail.com>

Conflicts:
	app/models/User.php
Update provides list.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.2'