fix imports
Merge branch 'master' of https://github.com/marklister/sbt-boilerplate

Conflicts:
	src/main/scala/spray/boilerplate/TemplateParser.scala