Merge remote-tracking branch 'upstream/lex' into nvp
troubleshooting mathparser
Merge branch 'nvp' of https://github.com/reolyze/Mogu into lex
All cppcheck issues that are not false positives have been fixed {not including new NVP}
Fix issues with compiling main.cpp (except issues with new NVP)
Factory Events.cpp
iterator changes for mathparser
resolving mathparser merge conflicts
merge conflicts