Merge branch 'wo_asset_pipeline' into dev

Conflicts:
config/routes.rb