NFC nowwww
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/codeepy/staywithme/app/MainActivity.java