Maj script controller
Merge branch 'master' of https://github.com/kelthalas/gamechallenge2014-9