Merge branch 'master' into trial

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