updates
Merge branch 'master' of ssh://github.com/peterwatts/allegria

Conflicts:
	aaContentModel/README.md