update info for forum 2014
merge master