Merge branch 'master' of C:\C3\c3-web with conflicts.
[CHANCE] Design Form file upload.
[Added] journal entity
Merge branch 'master' into event-manager
[Added] journal entity