xingqier
Merge branch 'master' of ssh://github.com/javaguy0726/automation_framework

Conflicts:
	MyJbehaveWebTest/src/main/java/org/jbehave/webdriver/sp/stories/login/SmsBaseStories.java
Wednesday by CK
dadd    util