change assert equal statements so that expected values are first
Merge branch 'master' of https://github.com/concerto/concerto

* 'master' of https://github.com/concerto/concerto:
  Added field_configs_controller and changed FieldConfig to use similar views to Subscription editing to support #664
  Removed manage html erb file for subscriptions that was not used anymore; redesigned screens#show view to close #680
  Added graphics and markup for 500 page to close #407
  Added 404 page graphic and markup for #407
  Create tmp directory - it doesnt exist in the repo