moved onclicks from the buttons into the linear layouts
Merge branch 'master' of github.com:prosaicpudding/HometownPortal