Merge pull request #126 from it-workshop/wp/CAROLINE-37/1

Wp/caroline 37/1
(cherry picked from commit adc74baa6ddc345d41bdc2500481680c4c832d23)

Conflicts:
	core/config.cc
	core/config.h
Merge pull request #125 from it-workshop/wp/CAROLINE-41/1

#CAROLINE-41
(cherry picked from commit 48eddbbedd60c4fb3eb951f08570866508d3d2fe)
Merge pull request #129 from it-workshop/wp/CAROLINE-44/1

CAROLINE-44: Default logging level is set to LOG_INFO.
(cherry picked from commit b02c9f8a2ffbf21d62b7fbc3282643c49b2a511b)
Merge pull request #131 from it-workshop/wp/CAROLINE-46/1

CAROLINE-46: Fix deadlock in ThreadBundle destructor.
(cherry picked from commit 22707c0ea174af6273eac5662f2fa90a127fda27)
Merge pull request #130 from it-workshop/wp/CAROLINE-37/2

crash fix. adds some pref registrations.
(cherry picked from commit 43aa642bfab314be48d5499de476338d2993e3f6)
Merge pull request #132 from it-workshop/wp/CAROLINE-37/3

wp/CAROLINE-37/3
(cherry picked from commit 280e51fb194a1ecfa627d22ecd45e32a547be4da)
Merge pull request #133 from it-workshop/wp/CAROLINE-3/3

ostream bug
(cherry picked from commit 764c3a5bc0254858120caea0afea72a3d1fe7e6c)
Merge pull request #134 from it-workshop/wp/CAROLINE-49/1

wp/CAROLINE-49/1: fix some bugs.
(cherry picked from commit cafabf12c64d6a471de686f6113a0c5b715ce10a)
Merge pull request #135 from it-workshop/wp/CAROLINE-49/2

CAROLINE-49: Refactor to new preferences.
(cherry picked from commit 9a8ebc5af010e8b1969a40ccf6d5b25eedb182e7)
Merge pull request #136 from it-workshop/wp-1.0.0/CAROLINE-37/1

Wp 1.0.0/caroline 37/1