Comming a WIP for code review
Push incomplete in case of blockage
Finish story-69

I think this also covers story-68 as well
Merge branch 'develop' of https://github.com/AnnArborTees/softwear-crm into story-69-david

Conflicts:
	db/schema.rb
Merge branch 'story-69-david' of https://github.com/AnnArborTees/softwear-crm into release-2014-10-03

Conflicts:
	db/schema.rb
Merge branch 'story-69-david' of https://github.com/AnnArborTees/softwear-crm into release-2014-10-03

Conflicts:
	db/schema.rb