Updated changelog
Official release of 3.6.0 for Windows and Linux
Merge remote-tracking branch 'UMS/master' into web