editeded recipes distros and opendroid.conf
Merge branch 'master' of github.com:oe-alliance/oe-alliance-core

Conflicts:
	conf/distro/opendroid.conf