Updates for 2.2
Merge branch 'master' of github.com:omeka/Documentation