15.Building out RESTful Controller methods
Merge remote-tracking branch 'origin/My_Own' into My_Own

Conflicts:
	app/tests/functional/UserControllerTest.php