Changed author in MAction
Updating controller branch with stuff. Sorry for the terrible commit summary