Merging changes to develop for start of 1.1 sprint

This pull request will setup the develop branch for the start of the 1.1 sprint