Merged with nc-oauth2
Merge branch 'develop' of github.com:Cloud-Star/ServerJEE into develop