piou piou
Merge branch 'Photo_Editing' of github.com:batspirit/Imagine into Photo_Editing

Conflicts:
	src/org/imagine/screensframework/screens/PhotoEditingScreenController.java