Merge remote-tracking branch 'origin/master'

Conflicts:
	gen/com/app/tomore/R.java
	res/values/strings.xml
	src/com/app/tomore/MainMagActivity.java