WIP including broken test (!)
Merge branch 'in_app_notifications' of github.com:mixpanel/mixpanel-android into in_app_notifications

Conflicts:
	src/main/java/com/mixpanel/android/mpmetrics/PersistentIdentity.java