Style fixes
Merge branch 'develop' of github.com:AnnArborTees/softwear-crm into develop