2013-02-28
Merge branch 'master' of https://github.com/080278/Transportation

Conflicts:
	busstopActivity.txt
	output.txt
	personCreated.txt
	summary.txt
	summaryBus.txt
	summaryBusStop.txt