Merge https://github.com/diegosarmentero/ninja-ide
Fixed highlihting fod definitions