Some fixes
Merge branch 'Manu'

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