general styling
Merge branch 'develop' of https://github.com/basekit-templates/shellbay into develop

Conflicts:
	metadata.json
changes