Merge branch 'story-212' into develop
Merge branch 'release-2014-10-31' of github.com:AnnArborTees/softwear-crm into release-2014-11-14
Merging release-2014-10-31 into develop
(QF) Description needs to be html safe
Merge branch 'develop' into release-2014-11-14
Merge branch 'release-2014-11-14' of https://github.com/AnnArborTees/softwear-crm into story-82-david