New 420 notification and action bar icons
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	app/src/main/res/layout/activity_my1st.xml
	gradle/wrapper/gradle-wrapper.properties