Transfer Files.
Merge branch 'master' of https://github.com/DarronXu/cardboard.git

Conflicts:
	bin/classes.dex
	bin/resources.ap_
	server/.ngrok-tcp