File uploader added
Disk image controller added to dashboard.htm Notification panel
Merge branch 'Testing' of https://github.com/scorelab/OpenDF into Testing

Conflicts:
	OpenDF-web/src/main/webapp/templates/index/projects.htm