Merge tag '2.2' into develop

tuning the cap deploy.rb file with better tasks for this type of deploys
replaceing default favicon
Merge branch 'release/2.3'