Added form progress steps
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/resources/client/edit-project.html