Merge pull request #253 from mballance-sf/master

Template changes
Updates for linked-resource issue
""
Merge remote-tracking branch 'origin/master'

Conflicts:
	ChangeLog.txt
Merge remote-tracking branch 'upstream/master'