Conflicts (hopefully) manually fixed - please check as i may have missed some, thanks
	templates/comments.tpl
	templates/edit_file_gallery.tpl
	templates/tiki-admin_calendars.tpl
	templates/tiki-admin_forums.tpl
	templates/tiki-calendar_edit_item.tpl
	templates/tracker/replace.tpl