Merge branch 'master' into Travis-Branch
made multi controllers work
Merge branch 'Travis-Branch'
Merge remote-tracking branch 'origin/master' into annes_branch