change some thing
Merge branch 'master' of git@github.com:celeskyking/s-tea.git

Conflicts:
	src/main/java/org/sky/auto/browser/AutoBrowser.java
Merge branch 'master' of git@github.com:celeskyking/s-tea.git

Conflicts:
	target/classes/META-INF/MANIFEST.MF