Working towards serial build
Merge branch 'devel' of github.com:ElmerCSC/elmerfem into devel

Conflicts:
	fem/src/CMakeLists.txt