additional functionality added to shared package
Merge branch 'master' of https://github.com/TeamPalmTree/shared

Conflicts:
	less/header.less
	less/template.less