Merge branches 'master' and 'mywallet' into mywallet
Added android packaging info to readme
new screenshots
added help icon
resized the buttons
put help icon on help button
resized the buttons back again
Merge pull request #24 from adasilva/mywallet

Added help icon: "Font Awesome by Dave Gandy - http://fontawesome.io".
simplified layout
removed extra grid layout containers
Merge pull request #25 from adasilva/cities
moved water hint to info popup
better positioning of info button
size and position of text input and vertical align of text
Merge pull request #26 from adasilva/cities

cosmetic things
city popup matches style of info popups
Merge pull request #27 from adasilva/cities

city popup matches style of info popups
merged in recent changes from master