clean the code
Merge branch 'develop' of https://github.com/feelpp/feelpp into develop

Conflicts:
	doc/manual/nonlinear/navierstokes.cpp
Merge branch 'develop' of https://github.com/feelpp/feelpp into develop