Simulation report goes back to the master
Merge branch 'jeremy-branch-1' of https://github.com/cmusv-sc/Practicum2014-Ericsson-Media into jeremy-branch-1

Conflicts:
	src/main/java/edu/cmu/messagebus/MDNManager.java