court-main-arslan

Merge remote-tracking branch 'bee_remote/master'

Conflicts:
	court-api/src/main/java/kz/bee/security/rest/AuthenticationService.java
	court-app/app/index.html
	court-app/app/scripts/app.js