shared less and template updates (standardization)
Merge branch 'master' of https://github.com/TeamPalmTree/shared

Conflicts:
	less/template.less