changes in ui in filemanager
Merge branch 'dev' of https://github.com/jr2wolfgang/wb_stage into dev

Conflicts:
	app/Plugin/User/View/Ads/new_ad.ctp
Merge branch 'dev' of https://github.com/jr2wolfgang/wb_stage into dev