test
Merge branch 'master' into veseto

Conflicts:
	CommonExpensesApp.xcodeproj/project.xcworkspace/xcuserdata/veseto.xcuserdatad/UserInterfaceState.xcuserstate
da
tmp commit for delete circle impl
complete implementation of delete circle fixes #36
merge
merge stufF
merge stufF
?
?
merge