Uploaded file and usermetadata model combined
Merge branch 'origin/master'

Conflicts:
	workspace/enwida/src/main/java/de/enwida/web/service/implementation/UserServiceImpl.java
Merge branch 'origin/master'