fixed nullpointer exception
Merge pull request #174 from glee23/master

Fixed NullPointerException
Fixed checkstyle issues (except Caps-ing local final vars)
Menu and Menu Item editing/creation now implemented! No deleting
anything yet
Merge branch 'master' into profile2
Cleaned up task tags and lots of dead code
Merge pull request #176 from blasv/profile2

Menu and Menu Item stuff