swatch added
Merge branch 'master' of https://github.com/salamatmoali/adapt-test-package

* 'master' of https://github.com/salamatmoali/adapt-test-package:
  updated to nicola's json
  fix to timeline narrative
  wipe.less

Conflicts:
	build/adapt/css/adapt.css
	build/adapt/js/adapt.min.js
	build/course/en/components.json
	src/course/en/components.json