Fixed nullpointerexception and string comparisons.
Merge branch 'master' of github.com:Josvanegmond/androidmoonbase