update
1.5.0
Merge branch 'master' of github.com:Strider-CD/strider

Conflicts:
	package.json