Iterative merging default set to 5
Iterative merging default set to 5
-Wno-cpp removed, due to cc1plus incompatibility
Lattice line plot cleaned up

postscript commands in 2dx_latline now better scaled (I hope)
Interation number in refinement script set back to 3
Revert e10e5ed..71647ea

This rolls back to commit e10e5ed8cb6aee8b1cf96e33cd4651784d52c5ca.
wrong commits cleaned up
.gitignore updated with files to ignore
.gitignore further updated
REDUCAC parameter now editable
% of Rfactor adapted tp 100% (instead of 10000%)
Reintegration of master to get all changes done by Henning

Merge branch 'master' into feature_reproject