Merge branch 'Fixes' of github.com:SBS-team/brightideas into refact
specs added
before merge
merge refact
test models