Changed body to uottawa_body and added weighted fields for content type.
Tweaked weights on fields for all content types.
fixed translatable title field
resolved conflicts
fixed but in base distribution
added wysiwyg profiles
fixed my stupid settings bug
added permissions to the content types
updated WYSIWYG profiles
Added required fields
Fixed merge issues
Added uottawa_short_title to article
Set uottawa_body height
info file updates for better packages and consistent names
Merge branch 'master' of cadbury:uottawa_news