Added precompiled assets
heroku fixes
Merge branch 'master' of github.com:Vizzuality/gfw

Conflicts:
	Gemfile