Add hasPrefix(prefix,s) and hasSuffix(suffix,s)
List functions in FuncMap and README.md alphabetically
Add trimPrefix(prefix,s) and trimSuffix(suffix,s)
Merge branch 'add-prefix-suffix-functions' into develop

Conflicts:
	README.md
	template.go