Merge branch 'api' into develop

Conflicts:
	db/schema.rb
Merge branch 'develop-david' of https://github.com/AnnArborTees/softwear-crm into develop
Fix bug when inputting bad data for sku and choosing retail