2014-8-30
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/dispatcher/Dispatcher.class
	bin/dispatcher/DispatcherFactory.class
	bin/util/FileParser.class
	src/dispatcher/Dispatcher.java
	src/dispatcher/DispatcherFactory.java
	src/util/FileParser.java