mac app
mac app?
macapp.
test
test2
try mac again
one more time
test
mac is a bitch
more?
Merge branch 'master' of https://github.com/EricWang94/HotFolder

Conflicts:
	run/bin/config/workspace.properties
	run/mac/HotFolder.jar
	src/config/LoginPanel.java
	src/options/User.java
	src/upload/DefaultUploader.java
	src/workspace/WorkspaceHandler.java