Security implementation (not tested)
Merge branch 'master' of github.com:olegsmith/playapingmod

Conflicts:
	app/controllers/Application.scala
	conf/routes
	public/ng-modules/crm.min.js
	public/ng-modules/home.min.js