Sam
Merge branch 'feature' of github.com:GiacoPalma/AlmhultFlyg into feature

Conflicts:
	src/app/Database.java