Global Settings Implements.
Admin Boolean Add.
Merge branch 'tmp' into user

Conflicts:
	Alicia/app/models/UserModel.scala
	Alicia/conf/evolutions/default/1.sql
Merge remote-tracking branch 'origin/user' into user
Merge branch 'user' into global
Administrator Implements.
Merge branch 'global' into project

Conflicts:
	Alicia/app/models/UserModel.scala