Merge branch 'master' into 1969-persistent-switch
authorTom Clegg <tom@curoverse.com>
Fri, 25 Apr 2014 17:26:43 +0000 (13:26 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 25 Apr 2014 17:26:43 +0000 (13:26 -0400)
commit1c5176d87df0dbd25db6ff1fb2ab82ae17472145
treec8e0aef51d0dfb8229367bb51e1cb5a579dbd365
parent5d356c84dcf8f3a2129cce0f4fbfc50f16a8a339
parent6d2128ae15825ef03472897e09710b176e3cc1d9
Merge branch 'master' into 1969-persistent-switch

Conflicts:
services/api/app/controllers/application_controller.rb
apps/workbench/app/controllers/users_controller.rb
apps/workbench/config/routes.rb
services/api/app/controllers/application_controller.rb