Moving to 2.04
Merge branch 'beta' of github.com:zijistark/EMF into beta