#U4-4153 Fixed Macro snippets refer to 'MediaCurrent' and 'Show', also polishes other snippets a bit
Merge branch '7.1.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0