Done, and all conflicts fixed on the dev branch

2017-06-21T17:29:28Z