sync
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	css/main.css
Merge branch 'dev' of https://github.com/ecadigital/shanntadev into dev