init baidu map
before merge
merge master and zenan
Update README.md
基本完成导航
Merge branch 'zenan' to 'master'
login and net changes
correct login.xml
template page complete
fix computer problem
changed
changed
changed
merge jackyu
changjian is ok now
before merge issue_15
commit to merge issue 15
merge
issue_#15 ok initial screen
checkout to master