Dev Branch Merge

After re-evaluating our repository structure, we decided it would be best to merge these branches and then make branches for releases, instead of development.