应用、资源模型搭建
routes
Merge branch 'master' of https://github.com/wyxpku/SmartAgent

Conflicts:
	.idea/workspace.xml
	app/controllers/apps_controller.rb
	app/controllers/pages_controller.rb
	app/models/user.rb
	app/views/pages/createapp.html.erb
	app/views/pages/start.html.erb
	config/routes.rb