Merge https://github.com/binwiederhier/syncany
Merge branch 'master' of https://github.com/binwiederhier/syncany
update unity tray
Merge branch 'gui' of https://github.com/vwiencek/syncany into gui

Conflicts:
	syncany-gui/src/main/java/org/syncany/gui/tray/TrayIconFactory.java
better integration of python script into sync any gui
…. external script seems to be the only clean way of doing
Merge branch 'master' of https://github.com/binwiederhier/syncany
Merge branch 'master' into gui
gui + plugin gui refactoring
update ui
gui unitytray
clean ui messages
Imrove wizard management
forgotten file
update tray