Mmm...
Merge branch 'master' of github.com:jeukel/FSQL

Conflicts:
	FSQL.pro.user