I'm so dumb

why did I have to convert it all into eclipse project.
Merge branch 'master' of https://github.com/SYPIAC/HearthStats.net-Uploader

Conflicts:
	uploader-osx/src/main/native/osx/liblept.dylib
	uploader-osx/src/main/native/osx/libtesseract.dylib