Updated CSS and JS to use asset helpers
Merge branch 'assets' into asset_helpers
Merge branch 'assets' into asset_helpers

Conflicts:
	Gemfile
	Gemfile.lock