Merge branch 'test_collasible_tree' of https://github.com/yyc1217/LongLiveTheKing.git into test_collasible_tree

Conflicts:
	static/js/index.js