Updated Change log with merge of theme and devel