Merge branch 'release/0.6.3' into develop
updated manual templates
bumped version
Merge branch 'release/0.6.4'