Updates.
Fixed bad version code.
Merge branch 'develop'
updates.
Merge branch 'master' into release-support

Conflicts:
	artifacts/support-fragments-4.1-javadoc.jar
	artifacts/support-fragments-4.1-sources.jar
	artifacts/support-fragments-4.1.aar
Re-compiled artifacts with new version code.