Merge branch 'master' of https://github.com/iossid/AAAFramework

Conflicts:
	AAAFramework.podspec