Attempt to fix assets.
Merge branch 'staging' of github.com:duffcodester/digiquatics into staging

Conflicts:
	Gemfile