Database fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	GlassCow/src/com/eaaa/glasscow/service/CowDatabase.java