IDEX-1051
Merge branch 'master' of https://github.com/codenvy/platform-api into new_project_json
IDEX-1051
Merge branch 'master' into new_project_json
IDEX-999
Merge branch 'master' into new_project_json
IDEX-1051: update format of project.json file
add creation time in descriptor of application process
Merge branch 'master' into new_project_json
Merge branch 'master' of https://github.com/codenvy/platform-api into new_project_json

Conflicts:
	codenvy-api-project/src/main/java/com/codenvy/api/project/server/ProjectTypeDescriptionService.java
Merge branch 'master' of https://github.com/codenvy/platform-api into new_project_json
IDEX-1051
Merge branch 'master' of https://github.com/codenvy/platform-api