Added Security. user: name. password: pass.
Merge remote-tracking branch 'origin/master'

Conflicts:
	AdminConsole.iml