modified:   app/models/ecstore/page.rb
Merge branch 'master' of https://github.com/jason0037/vt

Conflicts:
	app/models/ecstore/page.rb

	new file:   app/controllers/admin/tracks_controller.rb
	modified:   app/controllers/admin/wechat_controller.rb
	modified:   app/controllers/manco_controller.rb
	modified:   app/controllers/pages_controller.rb
	modified:   app/controllers/sessions_controller.rb
	modified:   app/controllers/store/orders_controller.rb
	modified:   app/decorators/controllers/weixin_rails_middleware/weixin_controller_decorator.rb
	modified:   app/models/ecstore/page.rb
	modified:   app/views/admin/shared/_top_menu.html.erb
	new file:   app/views/admin/tracks/index.html.erb
	new file:   app/views/admin/tracks/pages.html.erb
	modified:   app/views/manco/good_source.html.erb
	modified:   app/views/sessions/new_mobile.html.erb
	modified:   app/views/sessions/register_mobile.html.erb
	modified:   config/routes.rb