Merge pull request #300 from cchan5/master

Updated geolocation in mainactivity and dialog box works.
Answers and comments can now add location