upload crop
Merge branch 'master' of https://github.com/Lotto/HH2K13

Conflicts:
	apps/crop/crop.controller.class.php