Still need some work to do
Updated preg_replace for 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