Removed incorrect import statement.
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/core/app/views/origo/core/previewtoken/index.scala.html
Merged changes to security.
First version of component rendering.
Component rendering done. Closes #25.