Merge branch 'develop' into topic-CardView-GroupList

Conflicts:
	src/Views/History/List.js
Merge branch 'topic-CardView-GroupList' of https://github.com/Saleslogix/argos-saleslogix into topic-CardView-GroupList

Conflicts:
	src/Views/History/List.js