Token Form
Merge branch 'master' of https://github.com/IvenZ/awesome.git

Conflicts:
	app/views/Group/snippets/searchModalResult.scala.html