214 collapse timeline entries correct
228 done
Merge branch 'iOS-stub' into unstable

Conflicts:
	DralloLibrary/ApplicationContext.cs