Merge branch 'release/2.1.1'
Merge branch 'release/2.2'
Fixed YouTube embeds for Firefox
Removed google map functionality in the footer. Replaced map image with some icons
Merge branch 'master' into develop