Added rails-assets.
Merge branch 'development' into staging

Conflicts:
	Gemfile
Changed source of github gem.
Merge branch 'development' into staging
Merge branch 'staging' into production