ClassDAO + Metier
Commit merge
Merge branch 'createPresentation' into playActivity

Conflicts:
	src/com/example/presentationtimer/Task.java
Stuff, stuff, stuff!