add android lib
remove tmp file
merge file
Merge branch 'develop' of github.com:klggg/klggg into develop

Conflicts:
	.gitignore
	mylib/CommonHelper.php
	photo_move.php