Merge pull request #52 from xLaMbChOpSx/master

Cell Tracking Update, Disclaimer Acceptance, MapViewer Updates
Merge pull request #55 from xLaMbChOpSx/master

Default Icon Prefernce, Huge UI Update & NPE Fix
derp: Really fix NPE

Woops fixed the getter method but forgot to check if the direct method of getLine1Number
was used and of couse it was.

This should fix the NPE experienced with this issue now... Really I know I said it was
fixed before but now it should be REALLY fixed :)