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
IDEUI-59
Add isIntrenal property to ProjectImporte for hide it for users
Merge branch 'IDEX-948' of github.com:codenvy/platform-api into IDEX-948
IDEX-805. Use item's path instead of it's id on client-side.
add lifecycle annotation to JAXRS components
Merge branch 'master' of https://github.com/codenvy/platform-api
Merge branch 'master' of github.com:codenvy/platform-api
improve error handing
CLDIDE-1853: add rest and dao methods to search subscription history events
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
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