work in progress
Merge branch 'ucm' of https://github.com/davidhurley/joomla-cms into davidsbranch
Merge branch 'ucm' of https://github.com/davidhurley/joomla-cms into davidsbranch

Conflicts:
	libraries/cms/ucm/content.php
Clean up
Add jlayouts
Merge branch 'ucm' of https://github.com/davidhurley/joomla-cms into davidsbranch

Conflicts:
	installation/sql/mysql/joomla.sql
Merge branch 'ucm' of https://github.com/davidhurley/joomla-cms into davidsbranch
Merge branch 'ucm' of https://github.com/davidhurley/joomla-cms into davidsbranch
Merge branch 'ucm' of https://github.com/davidhurley/joomla-cms into davidsbranch
Work on updating component tables
Fix jlayouts, and redelete bad penny method
Merge pull request #6 from elinw/davidsbranch

Merge from Elin