Peter M. Groen / dali-demo

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: I092baac3133471d94aa62109548a745a74b037e0

Conflicts:
	examples/item-view/item-view-example.cpp
	examples/path-animation/path-animation.cpp

Change-Id: I6a266274f476748bf34a97652964f501f44fe00c

Conflicts:
	build/tizen/examples/CMakeLists.txt
	demo/dali-demo.cpp
	examples/buttons/buttons-example.cpp
	examples/item-view/item-view-example.cpp
	examples/text-view/text-view-example.cpp

Change-Id: I8816d065edca8e2a3fd37cdcedda4b02735f5007