fixing sort image url and incrementing version to 2.2
fixing merge conflict