resolved conflict in diag/Makefile
removed laplacianM create functions in mpi, created preconditioner for cylindrical, adapted mpi files
fixed merge conflicts in diag Makefile
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/feltor into mpi
added blas benchmark routine
Merge branch 'mpi' of pc40-c722.uibk.ac.at:Projekte/feltor into mpi
Merge branch 'cylindrical' into mpi
Merge branch 'develop' into mpi
checked mpi
Merge branch 'mpi' of pc40-c722.uibk.ac.at:Projekte/feltor into mpi
cout in mpi_init functions
Merge branch 'mpi' of pc40-c722.uibk.ac.at:Projekte/feltor into mpi
added elliptic_mpib
fixed merge conflict in elliptic.h
Merge branch 'develop' of pc40-c722.uibk.ac.at:Projekte/feltor into develop
Merge branch 'mpi' into develop
debugged feltor_hpc mpi version
some documentation
added matrices to bblas benchmark
adapted toefl to new interfaces