merge
added current location marker for AgendaMapFragment
bug fixes
Bug fixes
Icon ideas
Merge branch 'master' of git://github.com/AliceCengal/guide-android