This is a spike for #36 with various model changes
Merge branch 'master' of github.com:SWTI2014/SWTI2014-Project-03

Conflicts:
	packages/Designer.package/monticello.meta/version
kabum
kabum2
Merge branch 'fixthis'

Conflicts:
	packages/Designer.package/monticello.meta/version
Merge branch 'master' of github.com:SWTI2014/SWTI2014-Project-03

Conflicts:
	packages/Designer.package/monticello.meta/version