Updated relative path of iconic taxon icons; Updated gems and config for asset compiling
Removed redundant config
Merge branch 'assets' into asset_helpers

Conflicts:
	Gemfile
	Gemfile.lock