Merge branch 'development'
Fixed heroku deploy error
Added super pom for heroku deploy
Merge branch 'master' into development