minor changelog fix
remove outdated changelog line
update docs section in contributing guide
bring back the horrible timeout hack for Android, close #1785
update build
reorder items in the changelog a bit
merge master