update, lock, login
Merge branch 'new-design' of https://github.com/hyperreal/AcidAdServer into new-design

Conflicts:
	app/bootstrap.php.cache
	composer.lock
	src/Hyper/AdsBundle/Resources/public/css/main.css
	src/Hyper/AdsBundle/Resources/public/css/main.min.css
	src/Hyper/AdsBundle/Resources/public/less/global.less
	src/Hyper/AdsBundle/Resources/public/less/main.less