updated modules
update features to 2.2
Merge branch 'master' of github.com:groovehunter/drupal