Downgraded to Java 1.7
Merge branch 'master' of github.com:ADP-Hackathons/CommonConsumer

Conflicts:
	common-consumer/src/main/java/com/newco/hackathon/configuration/ControllerConfig.java