Merge pull request #2 from elinw/davidsbranch

Merging Elin's Latest Work
Merge pull request #3 from elinw/davidsbranch

Merge Elin's
Fixed problem with UCM and Core Content Saving
Merge Conflicts
Fixed tags displaying
Fix layouts, add some jlayouts