Some corrections
Merge branch 'manu'

Conflicts:
	src/com/example/aad2project/model/DatabaseHandler.java