Add Notes fragment
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/values/colors.xml
	app/src/main/res/values/dimens.xml
	app/src/main/res/values/strings.xml