DemoCtrl
restrict json api
base -> demo
Demo
works
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	app/assets/javascripts/scripts/app.js
	config/routes.rb