Parse java class annotations
Formatted instancectrl files with astyle
Moved #include for instancectrl.
Merge https://github.com/Forkk/MultiMC4
Add FIXME
Added some basic stuff for the new instance list system.
Fix Windows problems (UAC, MSVC Builds)
Fix crash after downloading snapshot in simple gui mode
Possible fix for java detection on OSX
And make the possible OSX java detection fix compile ~_~
Merge branch 'dev' of https://github.com/Forkk/MultiMC4 into dev
Remove some unused code from instance control
Fix some names in instance control
Added code for getting / setting instance groups.
Merge branch 'master' of https://github.com/peterix/MultiMC4 into dev
Merge branch 'groups' of https://github.com/Forkk/MultiMC4 into groups

Fix some obvious problems.

Conflicts:
	src/gui/mainwindow.cpp
Merge branch 'dev' into groups
Removed error.h include.
Basic rework of instance model
Temp fix for instance list reload crash