Merge pull request #3 from galstrom21/master

Merged automatically by jenkins after successful build test
End of sprint version bump.
add swift-proxy to the ha-able services
will fail if no back end services currently running so commenting out swift for now
Merge pull request #4 from mancdaz/master

Merged automatically by jenkins after successful build test