progress stuff
Merge branch 'master' of https://github.com/simoncomputing/Ghost

Conflicts:

src/main/java/com/simoncomputing/ghost/controller/GeneratorController.ja
va
	src/main/webapp/WEB-INF/flows/ghost/progress.jsp