Merge branch 'master' of github.com:DerOrfa/isis
add functions insert and transfer to PropertyValue
add json reader in PropertyMap
fix API_EXCLUDE_BEGIN/END macro
Merge branch 'master' into ch_propmap

Conflicts:
	lib/Core/CoreUtils/propmap.hpp