Removed test elements of main.

Those should be in the development branch, but not in master.
Updated readme with information on project branches.
Merge branch 'cef3'