2.2.1 pre work
Get ready for the 2.2.1 release
Update prettyPhoto plugin to version 3.1.5
Update the version.yml file
Merge branch '2.2/develop' into 2.2/master