Merge pull request #197 from previousnext/20353-password-policy

20353 password policy
[#15632] Add dependency on agov_components repo
[#15632] Run phpcs in phing task AFTER make file is run (so that new components are in place), and correctly exclude features files et al
[#15632] Remove agov items now in the agov_components repo
Merge branch 'master' into 2.x

Conflicts:
	build.xml
	drupal-org.make
	modules/custom/agov_core/agov_core.module
	modules/custom/agov_text_resize/theme/text-resize.tpl.php
	modules/features_content/agov_blog/agov_blog.info
	modules/features_content/agov_blog/agov_blog.views_default.inc
	modules/features_content/agov_content_blog/agov_content_blog.features.content.inc
	modules/features_content/agov_content_event/agov_content_event.features.content.inc
	modules/features_content/agov_content_media_release/agov_content_media_release.features.content.inc
	modules/features_content/agov_content_promotion/agov_content_promotion.features.content.inc
	modules/features_content/agov_content_slides/agov_content_slides.features.content.inc
	modules/features_content/agov_content_standard_page/agov_content_standard_page.features.content.inc
	modules/features_content/agov_news/agov_news.ds.inc
	modules/features_content/agov_news/agov_news.features.field_instance.inc
	modules/features_content/agov_news/agov_news.info
	modules/features_content/agov_news/agov_news.views_default.inc
	modules/features_content/agov_publications/agov_publications.features.field_instance.inc
	modules/features_content/agov_publications/agov_publications.info
	modules/features_content/agov_publications/agov_publications.views_default.inc
	modules/features_content/agov_slideshow/agov_slideshow.features.field_instance.inc
	modules/features_content/agov_slideshow/agov_slideshow.features.inc
	modules/features_content/agov_slideshow/agov_slideshow.info
	modules/features_content/agov_slideshow/agov_slideshow.strongarm.inc
	modules/features_content/agov_slideshow/agov_slideshow.views_default.inc
	modules/features_default/agov_editing/agov_editing.features.filter.inc
	modules/features_default/agov_editing/agov_editing.info
	modules/features_default/agov_editing/agov_editing.module
Add the agov_components submodule for development only
[#25267] Dump to Drupal 7.30
[hotfix] Remove old Upgrade instructions
Copy changelog from 1.x branch
Bring Changelog up to date
[hotfix] Remove old Upgrade instructions
Revert "Add the agov_components submodule for development only"

This reverts commit cfed215bd0a3f1f68e2538d3ea32ee1327101702.
Merge branch '7.x-2.x' into drupal/7.x-2.x
Merge branch '7.x-2.x' into 25299-ckeditor-wysiwyg