Mapping the Organisation and Focalpoint listinsg into their respctive templates.
Merge branch 'master' of github.com:syslabcom/hw2014theme

Conflicts:
	rules.xml