Adding Scenarios to Menu, resizing of images

some trying around to get pixlr to work->failed
Merge remote-tracking branch 'origin/jojjo_working' into jojjo_working

Conflicts:
	app/View/Images/display_scenario.ctp
	app/webroot/js/pixlr.js
Merge branch 'jojjo_working' of https://github.com/Jojjo/Assignment3 into jojjo_working

Conflicts:
	app/View/Images/display_scenario.ctp