Still need some work to do
city to database and cookie
events are sorted
Merge branch 'city_from_ip' into development

Conflicts:
	composer.json
	composer.lock
Updated preg_replace for keywords
Faster updating events
Updating events fix
Updated quiz and its getting keywords
Merge remote-tracking branch 'origin/fix-keywords' into development
Merge remote-tracking branch 'origin/fix-keywords' into development
Merge branch 'development' of github.com:nfqakademija/atotrukis into development

Conflicts:
	src/Atotrukis/MainBundle/Service/AdminService.php
Revert "Merge branch 'development' of github.com:nfqakademija/atotrukis into development"

This reverts commit 191de308b287ed7b1ede85b8c95ec7012128b8bf, reversing
changes made to 306bf2aa4b2734333849c43966f057ad855a8f8e.
Fixes after revert
composer.lock file update because of failing travis
Fixed bug with event search
test fix
temporary city fix
Registration page style fix
Removed unused comments button and some unused code
Removed unused comments button