Update the version string to beta 7
Merge branch 'master' of github.com:OSTraining/com_osmeta

Conflicts:
	src/com_osmeta/osmeta.xml
	src/plg_content_osmetacontent/osmetacontent.xml
	src/plg_system_osmetarenderer/osmetarenderer.xml