Fixed a template syntax error
Merge branch 'feature/showrca2014' into develop
Merge remote-tracking branch 'origin/develop' into staging