Peter M. Groen / dali-demo

Change-Id: I399401a09e722fd85a026ffc2189e6bd090147f9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>

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: I9fb727955e339e123f5ca92fbc15a7d2d1479939
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

Change-Id: I1d3e62c1ad548c1c81b4c8dab2246c22a68249aa
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>