Making sure everything is up to date
Merge branch 'testing'
Commiting published source
Moved editors back to separate activities