Update docker image to use 0.3.6
Add hasPrefix(prefix,s) and hasSuffix(suffix,s)
Merge branch 'has-prefix-suffix' into develop

Conflicts:
	README.md
	template.go