Checked //@author tags
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/database/DatabaseFacade.java
	src/database/DatabaseLogic.java
	src/database/TaskReader.java
	src/database/TaskWriter.java
	src/objects/DateTime.java
	src/objects/Task.java