Merge branch 'development'
Merge branch 'development'
bug fix on final test before pushing to herok