Add preferences option to change the indicator items layout. Fixes issue: #116
Merge pull request #280 from cas--/Feature/EditIndicatorLayout

Add preferences option to change the indicator items layout. Fixes #116
Merge branch 'master' of github.com:nvbn/everpad
Fix conflict parent with new sqlalchemy
Fix serialisation of conflict parent
Merge remote-tracking branch 'nvbn/master' into tags