Version 1.0
Merge branch 'master' of https://github.com/lordtao/android-tao-data-processor

Conflicts:
	.gitignore