added postgres removed sql3
Merge branch 'master' into prod
added postgres removed sql3
Include web font in application.css
Add rails_12factor
added link on static maps
Merge branch 'master' into prod

Conflicts:
	app/views/locations/index.html.erb
Merge branch 'master' into prod

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/locations/index.html.erb
removed extra gem
Merge branch 'master' into prod

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/locations/index.html.erb
removed extra
Merge branch 'master' into prod
removed extra bits
Merge branch 'master' into prod
Merge branch 'master' into prod
Merge branch 'master' into prod
Merge branch 'master' into prod
Merge branch 'master' into prod
Merge branch 'master' into prod
Merge branch 'master' into prod