add menu tree to index.jsp, add method renameMenu to ConsoleController
Merge pull request #9 from cxxwode/master

merge the conflict
change database config
merge for lufeng
��Ӳ˵��ı����ɾ����
Merge branch 'master' of https://github.com/cocosvsn/demo
some test do nothing