User guide
Merge branch 'dev' of github.com:lperepol/SelkirkCRM into dev