TomCraftLauncher
Merge branch 'master' of github.com:AlexSMG/TomCraftLauncher

Conflicts:
	database.cpp
	database.h
	mainwindow.ui
	ui_mainwindow.h