cm
Merge branch 'master' of https://github.com/tgioihan/androidcore

Conflicts:
	.idea/libraries/fabric_1_0_0.xml
	.idea/libraries/gson_2_2_4.xml
	.idea/libraries/support_v4_21_0_0.xml
	.idea/libraries/tweet_composer_0_7_0.xml
	SocialActivityTest/SocialActivityTest.iml
	SocialActivityTest/build.gradle
	core/build.gradle
	core/core.iml
	core/crashlytics.properties
cm