updated
Merge branch 'master' of github.com:jhkim13/rmfpqb

Conflicts:
	app/src/main/AndroidManifest.xml