<save/save as works, crop form added>
Merge branch 'master' of https://github.com/jthogan/GUIGt

Conflicts:
	Prog1_GUI.pro.user
	mainwindow.cpp
	mainwindow.h