Signed-off-by: codekitten <codekitten@ict>
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/im/dadoo/teak/mvc/controller/CategoryController.java