- Rename rest directory to controller
- Split UploadFile on 2 files (MainController and UploadController)
- Add direcory config property
- Remove secureId field in upload form
Merge remote-tracking branch 'origin/master'

Conflicts:
	dropbitz/src/main/java/org/teknux/dropbitz/Application.java