Merge branch 'fred'

Conflicts:
Tester/src/Tester.mxml