change c++0x for c++11
remove useless includes
Merge branch 'develop' of github.com:yannickspill/gp into develop
WIP