Database update -- Lot's of stuff update and added
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/joni/frisbeegolf/DatabaseHelper.java