Merge branch 'berhacker'
Merge branch 'master' of heroku.com:openhdi
Merge branch 'master' of heroku.com:openhdi