Merge branch 'master' of https://github.com/beeos/beeos.github.io

Conflicts:
	_data/wishlist.yml