working on ImageForm
Merge branch 'master' of https://github.com/olegkrivtsov/using-zend-framework-2-book

Conflicts:
	formdemo/module/Application/src/Application/Controller/ImageController.php