removed filse
Merge branch 'dev' into heroku
heroku stuff added'