Merge branch 'develop' of https://github.com/wehlutyk/daydreaming into feature/ui

Conflicts:
	src/main/java/com/brainydroid/daydreaming/ui/FirstLaunchSequence/FirstLaunch03ProfileActivity.java
	src/main/java/com/brainydroid/daydreaming/ui/FirstLaunchSequence/FirstLaunch05MeasuresActivity.java
dealing with notification preferences
small conflict at merge