General -> general
Merge branch 'master' of https://github.com/scanniza/DesktopHipster

Conflicts:
	DesktopHipster/src/main/java/view/BrowseView.java