faktor/refaktor
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/Adminka.scala
faktor/refaktor