conflict file
Merge branch 'dev' of https://github.com/jr2wolfgang/wb_prod into dev

Conflicts:
	app/useradmin/views/index.volt