sql stuff rad
Merge branch 'master' of https://github.com/Brc509/Settlers

Conflicts:
	server/src/catan/server/persistence/SQLitePlugin.java