fineuploader fix
Merge branch 'master' of github.com:hankeypancake/imget

Conflicts:
	app/controllers/image_controller.js