- Add git flow to git
- Add beginning of being able to change preferences from tasker.
Merge pull request #17 from hawkeyexp/master

better syntax und fixed typo
- Add fix for samsung devices calling an on-click when user never clicked (and thus variables are null)
Merge pull request #21 from dattas/develop

Develop merge to master
Allow converting or replacing characters or text before sending off to the pebble device.
2.7 release
Merge branch 'release/2.7'
Merge branch 'release/2.7' into develop
Fix for situations like quiet hours from 9am to 5pm
Merge branch 'hotfix/quiet_hours'
Merge branch 'hotfix/quiet_hours' into develop
bump version for beta group
Add ability to filter notification text across all applications or just individual applications
Fix dialog on conversion preference
File name typo fix
Merge branch 'hotfix/translation_dialog_fix'
Merge branch 'hotfix/translation_dialog_fix' into develop
Add empty conversions string to strings.xml
Merge branch 'hotfix/translation_fixes'
Merge branch 'hotfix/translation_fixes' into develop

Conflicts:
	res/values-de/strings.xml
	res/values/strings.xml