Merge branch 'company'

Conflicts:
	TestAndStudyDemo/bin/classes/.gitignore
add buttome tag
Merge branch 'master' of https://github.com/dl0218/TestAndStudyDemo.git