Adjusted the size of buttons
Merge branch 'dev' of github.com:bharaththiruveedula/Map-your-friend into dev
Merge branches 'master' and 'dev'