version up
Merge branch 'release/v0.1.20' into develop

Conflicts:
	project/Build.scala
v0.1.21
Merge branch 'release/v0.1.21' into develop