Merged
Merge branch 'master' of https://github.com/wade0564/test.git
complete DEV, move to QA
Merge branch 'master' of https://github.com/wade0564/test.git

Conflicts:
	LogParser/src/main/resource/logParser.properties