Merge branch 'develop'

Conflicts:
	tag/jekyll.html
	tag/sbt.html