update
Merge branch 'master' of https://github.com/calois/Work.git

Conflicts:
	LdapConfigTest/src/main/java/com/nasdaqomx/selenium/test/base/TestService.java
	LdapConfigTestWeb/src/main/webapp/WEB-INF/spring/test-context.xml