Miles Gould 4701bd1b2e Merge branch 'dev' into places2 ...

Conflicts:
	Gemfile.lock
	config/application.rb
	credentials.example

2013-08-31 15:49:30 +01:00

..

controllers

…

factories

…

helpers

…

lib/haml/filters

…

mailers

…

migrations

…

models

…

requests

…

routing

…

support

…

views

…

spec_helper.rb

…