Merge branch 'dynamic-model' of ssh://aptx.org/var/git/localmylist into dynamic-model

Merge branch 'dynamic-model' of ssh://aptx.org/var/git/localmylist into dynamic-model

Conflicts:
	localmylist/dynamicmodel/data.cpp
	localmylist/dynamicmodel/data.h
	localmylist/dynamicmodel/datatype.cpp
	localmylist/dynamicmodel/datatype.h
	localmylist/dynamicmodel/dynamicmodel_global.h
	localmylist/dynamicmodel/model.cpp
	localmylist/dynamicmodel/model.h
	localmylist/dynamicmodel/node.cpp
	localmylist/dynamicmodel/node.h
	localmylist/dynamicmodel/types.cpp
	localmylist/dynamicmodel/types.h
	localmylist/localmylist.pro