Cleaned up some merging, added project.properties to the ignore list.
Added LocationUtils and LocationListener back in to update user's location, modified map screen xml to use map: attributes to disable some ui controls, and fixed some issues with LocationDialogFragment not properly launching.
Minor changes to mapactivity, note, and group in preparation to add markers to the map
Merged with master
Added addNoteToMap function to add a note marker to the map
Added editnote dialog and listener so that notes can be edited and the map will be updated
Added some additional documentation prior to code review to make things more clear.  Added a simple refresh button to update the map manually
Work in progress merge
Work in progress merging branches
Finished merge with working components
Working merge
Merge branch 'master' into addgroupadduser