image manager
Merge branch 'dev' of https://github.com/jr2wolfgang/wb_stage into dev

Conflicts:
	app/View/Themed/Nakatipid/Ads/index.ctp