2.0
Merge branch 'master' of
https://github.com/429365799/Android-Traning.git

Conflicts:
	AndroidTrainingServer/WebContent/css/index.css