Making changes for feature-a.
Added text for feature-a1 changes.
Merge branch 'feature-a' into release-2.7.1

Conflicts:
	readme.txt
Merge branch 'feature-a1' into release-2.7.1

Conflicts:
	readme.txt