Merge branch 'master' of https://github.com/holmesli/ToMore

Conflicts:
	.classpath
	gen/com/app/tomore/BuildConfig.java
	gen/com/app/tomore/R.java