Aspect getter introduced
Updated master page for user name
Timestamp to time change column
File metadata update
Merge branch 'origin/master'

Conflicts:
	workspace/database/bootstrap.sql
	workspace/enwida/src/main/java/de/enwida/web/controller/UploadController.java
	workspace/enwida/src/main/java/de/enwida/web/model/Group.java
	workspace/enwida/src/main/java/de/enwida/web/service/implementation/UploadFileServiceImpl.java
	workspace/enwida/src/main/webapp/WEB-INF/views/user/upload.jsp
File metadata update