Peter M. Groen / dali-demo

Conflicts:
	demo/dali-table-view.cpp
	examples/item-view/item-view-example.cpp
	examples/size-negotiation/size-negotiation-example.cpp
	examples/text-view/text-view-example.cpp

Change-Id: I4b9a9eb30ad190b329115ff093120ac06343e26d

Change-Id: I2844fd73a4bb49389d3df8dc287785ed415d2823

Change-Id: I33d4a33a2b50e1d5a5debf1a2f5be5f24c97dd0a

Change-Id: I5932f0191f358e986fcaace820fb2ecb43b9812b

Conflicts:
	demo/dali-demo.cpp
	demo/dali-table-view.cpp
	examples/builder/examples.cpp
	examples/buttons/buttons-example.cpp
	examples/item-view/item-view-example.cpp
	examples/path-animation/path-animation.cpp
	examples/text-view/text-view-example.cpp
	shared/view.h

Change-Id: I152b06854b349f0430172227f1d79ee16855fbc0

Change-Id: Iffcdd6753c39fa83e7f68ef927339374bc0061a2