The type_id<T>() function is now thread-safe
Merge branch 'master' of github.com:nicola-gigante/elektra

Conflicts:
	src/utility.cpp