Fixed...
Merge branch 'master' of github.com:ballarat-hackerspace/PeeOnATree-Client
Merge branch 'master' of github.com:ballarat-hackerspace/PeeOnATree-Client