Change analytics software from flurry to crashlytics
Merge remote-tracking branch 'origin/master'

Conflicts:
	proguard-rules.pro