correct paths, user rights, fixed update and save versions
Merge branch 'jojjo_working' of https://github.com/Jojjo/Assignment3 into jojjo_working

Conflicts:
	app/View/Images/display_scenario.ctp
	app/View/Images/index.ctp