Merge of devel into Feature/fields refactor.

I would be glad if some gl-coredeves would start to look at the latest changes that have been happening in globaleaks about the new "fields" feature.

Note: as a result of the latest merge, there is still one critical unittest failing (TestStep), but I plan to take care of it in the next 48 hours and add the fix to this pull-request.