small pixlr changes

adding css (custom.css) for resizing of images, images now are of class
image
pixlr.js and css change
Merge branch 'jojjo_working' of https://github.com/Jojjo/Assignment3 into jojjo_working
fixing display_images (small change)
Changes to get Pixlr partially working
Merged
Adding Scenarios to Menu, resizing of images

some trying around to get pixlr to work->failed
Incorporated image sizing fix in display_scenario
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
Revert "Changes to get Pixlr partially working"

This reverts commit ab76a0b14be38d8f1ef022c1dd2449efc89bca89.

Conflicts:
	app/View/Images/display_scenario.ctp
	app/webroot/js/pixlr.js
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
Fixing mashed merge
Addition of more complex versioning, usability features, and uesr registration
Changing debug level and making Logout button visible