changes in main
Merge branch 'master' of https://github.com/senacor/Hacking-Days-2014

Conflicts:
	microservice/HazelCollector/src/main/java/com/senacor/hdays2014/hazelCollector/Main.java