Merge branch 'development'
correct version number
fixed 2 bugs

- falsely asking for Merlin-username when calculating on x02da
- error with path-rewrite due to a wrong property name
testing - task 52: Field visibility (from tif, from cpr for Paganin) on
Ubuntu 12.04 
http://github.com/gnudo/grecoman/issues/issue/52