Comment and clean code
Merge branch 'Manu'

Conflicts:
	src/com/example/aad2project/model/DaoBase.java
	src/com/example/aad2project/model/DatabaseHandler.java
	src/com/example/aad2project/ui/MainActivity.java
	src/com/example/aad2project/ui/ManagerActivity.java