Demo and Depot scaffold
Merge branch 'master' of github.com:ncoop/agile-rails-4