Create ads and edit fix
Merge branch 'dev' of https://github.com/jr2wolfgang/wb_stage into dev

Conflicts:
	app/Plugin/User/Controller/AdminsController.php
	app/Plugin/User/Controller/UsersController.php