update
Merge branch 'master' of https://github.com/jollyrancherman/forge

Conflicts:
	app/controllers/ImageController.php