add new options to settings
resolve merge conflicts
android push
android push 2
remove friend invite accept from notifications
remove end of hop from notifications
notifications refactoring
resolve merge conflicts
notifications refactoring 2
notifications refactoring 2
add template to confirmation email