Added cubie boards detection
Merge branch 'master' of https://github.com/syncloud/owncloud-setup

Conflicts:
	build-image.sh