user story 56 / Sprint / Alexander Schmidt / Task creation / Create time slot / As a senior I need the opportunity to set a time slot for a specific task in order to tell the trainee when to fulfil it.
Merge branch '56_Taskcreation_Createtimeslot'

Conflicts:
	Root/src/main/java/de/osramos/ss13/proj1/model/Taskdb.java
	Root/src/main/java/de/osramos/ss13/proj1/model/Taskdb_Roo_JavaBean.aj
	Root/src/main/webapp/WEB-INF/i18n/application.properties
	Root/src/main/webapp/WEB-INF/views/taskdbs/create.jspx
	Root/src/main/webapp/WEB-INF/views/taskdbs/show.jspx
	Root/src/main/webapp/WEB-INF/views/taskdbs/update.jspx
Merge branch 'master' of https://github.com/alexander-informatik/amos-project-audi

Conflicts:
	Root/src/main/java/de/osramos/ss13/proj1/model/Taskdb.java
	Root/src/main/java/de/osramos/ss13/proj1/model/Taskdb_Roo_JavaBean.aj
	Root/src/main/webapp/WEB-INF/views/taskdbs/create.jspx
	Root/src/main/webapp/WEB-INF/views/taskdbs/show.jspx
	Root/src/main/webapp/WEB-INF/views/taskdbs/update.jspx