Merge branch 'release-2.1' into develop
Merge branch 'release-2.2'
Release version 2.2
Updated Apple touch icons
Updated to Bootstrap 2.3.1
Fixed some errors in Joomla styles
Updated to jQuery 1.9.1
Merge branch 'release-2.2'