(no issue)
Merge branch 'master' of
https://github.com/htwchur/ch.htwchur.iuk_iii_w.orm.git

Conflicts:
	todo-JDBC-Swing/src/main/java/ch/htwchur/iuk_iii_w/todoJDBCSwing/Category.java
	todo-JDBC-Swing/src/main/java/ch/htwchur/iuk_iii_w/todoJDBCSwing/Task.java
	todo-JDBC-Swing/src/main/java/ch/htwchur/iuk_iii_w/todoJDBCSwing/swing/TasksPanel.java