Signed-off-by: c4cat <313187850@qq.com>
Merge branch 'master' of https://github.com/c4cat/cobox.git

Conflicts:
	static/js/backbone-drag.js

Signed-off-by: c4cat <313187850@qq.com>
Signed-off-by: c4cat <313187850@qq.com>
Merge branch 'master' of https://github.com/c4cat/cobox.git
Merge branch 'master' of https://github.com/c4cat/cobox.git
Signed-off-by: c4cat <313187850@qq.com>