Merge remote-tracking branch 'origin/master'

Conflicts:
	src/sample_title_screen.js