Issue #1998104 by esteve.badia: Re-started test file. Deleted fill.php script. Fixed some bugs in exchange creation form.
Hope fixed conflicts
Fixed a typo when cleaning code
Fixed some coding standard typos in new code.
Issue #1998104 by esteve.badia: Added some coded lost in commit #0565c38.