user story 55 / Sprint / Alexander Schmidt / Task creation / Create completion password / As a senior I need to opportunity to define a password a user has type in when he/she completed the task in order to check if it was done.
user story 59 not yet done / Sprint / Alexander Schmidt /
Merge branch '59_Taskcompletion_Marktaskascompleted' into 55_Taskcreation_Createcompletionpassword

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
user story 59 / Sprint / Alexander Schmidt / Task completion / Mark task as completed / As a trainee, I need the opportunity to mark a fulfilled task as completed with typing in a password in order to show that I have done it.
Merge branch '55_+_59_Taskcreation_Createcompletionpassword'

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/menu.jspx
	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
	Root/src/test/java/de/osramos/ss13/proj1/model/TaskdbDataOnDemand_Roo_DataOnDemand.aj