IDEX-948
IDEX-948
Merge branch 'master' of https://github.com/codenvy/platform-api into IDEX-948

Conflicts:
	codenvy-api-account/src/main/java/com/codenvy/api/account/server/AccountService.java
	codenvy-api-account/src/test/java/com/codenvy/api/account/AccountServiceTest.java
IDEX-948
Merge branch 'IDEX-948' of github.com:codenvy/platform-api into IDEX-948