Updates pro modulo max e inputManager
Merge
Merge commit '03d65c4'
Merge branch 'master' of https://github.com/gabrielnaves/OAC_Final_2-2014