Bugfix
Merge remote-tracking branch 'origin/master'
-Added Buttons to Map
-Added Button Icons with PaintCode
-Added functionality to store the last contact chosen with CoreData