Updated to new module tags
Merge remote-tracking branch 'upstream/master'

Conflicts:
	framework/TskModules/c_RegRipperModule
	framework/TskModules/c_SummaryReportModule

 All conflicts fixed but you are still merging.