Adding keyboard and buttons
Merge branch 'master' of github.com:BaobabHealthTrust/app_gateway