Merge shippers and receivers into daily report page.
Conflicts:

	lib/m2mhub/version.rb