New release
Conflicts resolved.
Merge branch 'master' of github.com:LendLink/stampede