Merge
Merge branch 'master' of https://github.com/TeeFun/TeeFun

Conflicts:
	src/main/java/com/teefun/controller/queue/QueueController.java