bumping rails to safe version
adding assets
removing assets
Merge branch 'master' into new-design

Conflicts:
	.rvmrc
	Gemfile
	Gemfile.lock