Includes issue.
Merge branch 'mastercontroller' of https://github.com/venkatn93/EnvyEngine into mastercontroller