Add cancel button when editing server
Update changelog for version 1.6
Merge branch 'master' into debian
Fix #3 : Add cancel button when editing server
Merge branch 'master' into debian