Bump version to 0.3.1
Merge branch 'master' into 0.4-development

Conflicts:
	CarthageKit/Info.plist
	carthage/Info.plist