Trying to fix Heroku assets
Commented out map shifting
Merge branch 'development'