Review main Merged

14094[BUGFIX] "template" was replaced by namespace everywhere

Nicole Hummel CR +2 V +2 Easy +24 −14 updated 06/03/13, 20:49