Split into three separate projects: library, gui and cmd
Fix includes in mac specific headers
OS X explicitly requires the neon include path to be set
Try to handle BUILD_LIBRARIES_ONLY correctly

Also, try to fix OS X build
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
Make krazy target work again
Make NSIS installer work with new structure
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir

Conflicts:
	src/gui/folderman.cpp
Merge branch 'master' into move_lib_to_sep_dir

Conflicts:
	cmake/modules/NSIS.template.in
	src/CMakeLists.txt
	src/creds/shibboleth/authenticationdialog.cpp
	src/creds/shibboleth/authenticationdialog.h
	src/gui/owncloudgui.cpp
	src/libsync/creds/shibboleth/authenticationdialog.cpp
	src/libsync/creds/shibboleth/authenticationdialog.h
	src/libsync/mirallaccessmanager.cpp
	src/mirall/authenticationdialog.cpp
	src/mirall/authenticationdialog.h
Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir

Conflicts:
	src/CMakeLists.txt
	src/gui/accountsettings.cpp
	src/gui/folderwizard.cpp
	src/gui/settingsdialog.cpp
	src/libsync/syncengine.h
Build after merge
[tx-robot] updated from transifex
Fix tests
Merge remote-tracking branch 'origin/1.7'

Conflicts:
	src/gui/socketapi.cpp
[tx-robot] updated from transifex
[tx-robot] updated from transifex
Merge branch '1.7'

Conflicts:
	src/CMakeLists.txt
	src/cmd/cmd.cpp
	src/gui/folderman.cpp
	src/gui/wizard/owncloudadvancedsetuppage.cpp
	src/libsync/account.cpp
[tx-robot] updated from transifex
[tx-robot] updated from transifex
[tx-robot] updated from transifex