update drupal core to 7.22
change deploy branch to develop
Merge branch 'feature/update_drupal' into develop

* feature/update_drupal:
  change deploy branch to develop
  update drupal core to 7.22
revert drupal core update
updated drupal core to 7.22
Updated phing template
Merge remote-tracking branch 'origin/v2' into feature/newtheme

Conflicts:
	build_siteprocessor.make
Merge branch 'develop' into feature/newtheme