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

Conflicts:
	Gemfile