x
x
x
x
x
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	htdocs/assets/codekit-config.json
new feature: added option in function-bar to select the number of tickets to be displayed per page
new feature: added notifications to appear when an object has been moved to another workflow list. There is now the possibility to undo the move.
x
Merge remote-tracking branch 'origin/dev'

Conflicts:
	htdocs/assets/codekit-config.json
	htdocs/assets/js/main-ck.js
x
x
x
x
x
x
x
Merge remote-tracking branch 'origin/master' into bug

Conflicts:
	htdocs/assets/codekit-config.json
	htdocs/assets/js/main-ck.js