added .gitignore
Merge branch '2.0'
Merge branch '2.0'
fixed RESTful paramters
fixed route
fixed dao
fixed dao
fixed orm