cosmetics
Merge branch 'master' into lovrenca
merge conflict handled :1
Merge branch 'master' into lovrenca
added NOTES, product owner can  confirm a story
Merge branch 'lovrenca'