Renamed packages so my version would match the general version.
Merge branch 'master' of https://github.com/scanniza/DesktopHipster

Conflicts:
	DesktopHipster/src/main/java/controller/Controller.java
	DesktopHipster/src/main/java/model/Model.java
	DesktopHipster/src/main/java/view/UploadView.java