modify menu class
fix merge
Merge branch 'master' of https://github.com/Avikash-Mishra/PixelJam2014