corrected configuration mapping
Merge branch 'unstable' of github.com:stestaub/drallo-app into unstable
Merge branch 'unstable' of github.com:stestaub/drallo-app into unstable
timeline entry expand/collapse (need testing)
Merge branch 'unstable' of github.com:stestaub/drallo-app into unstable

Conflicts:
	DralloAndroid/DralloAndroid.csproj