init dev branch

maj diago
Merge branch 'dev'
heroku branch