merge
Merge branch 'master' into spencer
controllers
merge fix
late night changes