Merge branch 'master' of https://github.com/DreamSea/zzz20141205

Conflicts:
	dlDemo/partials/devices.html