merged changes from bitbucket and branch laptop

.gitignore

preproc/python/FlexpartTools.py

preproc/python/FlexpartTools.pyc

preproc/python/GribTools.py

preproc/python/GribTools.pyc

preproc/python/UIOTools.pyc

preproc/python/getEIdata.py

preproc/python/prepareFLEXPART.py

preproc/src/CONVERT2

preproc/src/ftrafo.mod

preproc/src/ftrafo.o

preproc/src/grphreal.o

preproc/src/grtoph.mod

preproc/src/makefile_gfortran

preproc/src/makefile_intel

preproc/src/phgrreal.o

preproc/src/phtogr.mod

preproc/src/preconvert.o

preproc/src/rwGRIB2.o

preproc/src/rwgrib2.mod