Add better settings page
Add locations to database
new location helper methods
finish location update part 1
Merge branch 'develop'

Add location features to master