Fix
Merge branch 'feature-multi_app-2014_01_10' of
https://github.com/calois/Work.git into feature-multi_app-2014_01_10

Conflicts:
	LdapConfigTest/src/main/java/com/nasdaqomx/selenium/test/base/TestUtils.java
Fix