openvix: build 693
Merge branch 'master' of git://github.com/OpenViX/enigma2

Conflicts:
	ChangeLog
Merge branch 'master' of https://github.com/openatv/enigma2