Solving merge conflict from dw-guice branch
Conflicts:
	src/main/java/com/dyn/api/dw/ServerMainApp.java
Solving conflict
Conflicts:
	src/main/java/com/dyn/api/dw/ServerMainApp.java
EMM-1793 Initial Guice integration