Generated new encrypted API key for Heroku (again)
remove scaffold.css
remove dublicate rspec-rails in Gemfile
Merge branch 'master' into dev

Conflicts:
	Gemfile