Merge remote-tracking branch 'origin/dev'
updated manifesto to include new -static- template files
use _current sprint by default for result-per-story command
Merge remote-tracking branch 'origin/master' into dev