edit profile
Merge branch 'dev' of https://github.com/jr2wolfgang/wb_stage into dev
add style for file manager
Merge branch 'dev' of https://github.com/jr2wolfgang/wb_stage into dev

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