Add Folder column to Details sync protocol

Also fixes padding

Fixes #1037
Add some progress meassuring logging.
Use qint64 rather than int64_t.
Handle sync enable flag correctly in folder scheduling.

This fixes bug #1083.

Conflicts:
	src/mirall/folder.cpp
Fix literal occurances of "ownCloud" in GUI
Reconnect if network is unavailable after startup

Fixes: #1080
Remove bogus html formatting tag.
Make problem warnings not appearing in the tray.

This fixes bug #944: Do not show the warning icon in the tray.
Fix initialized after warning.
Proxy support: Reset useSystemConfiguration() in all cases but DefaultProxy

Fixes #1016
Avoid quick flickering up of the ok-icon for the sync prepare state.

For the SyncPrepare phase now the icon that was displayed before is
kept. If the folder was disabled before, the sync icon is displayed.
Do not show progress if nothing is transmitted, show number of deletes.
Don't show desktop notification when the user don't want to

Fix #1093
Do append non empty lines not starting with a hash to ignores.
Handle proxy on folder level, not folderman level.
1.4.2beta1
Do not elide the progress text

It's size is computed so the text fit, there is no need to alide it.

Fixes #1094
Merge branch '1.4'

Conflicts:
	VERSION.cmake
	src/mirall/application.cpp
	src/mirall/application.h
	src/mirall/csyncthread.cpp
	src/mirall/folder.cpp
	src/mirall/folder.h
	src/mirall/folderman.cpp