layout; change patavi progress update contract
Merge branch 'develop' of github.com:DanielReid/gemtc-web into develop

Conflicts:
	app/js/controllers/modelController.js