Included ZigBee files.
Added *.layout to .gitignore.
Cleaning...
Fixed merge.
Removed ZigBee parts.