added in zonable and attributes components and unit tests for each.
Merge remote-tracking branch 'origin/master'