Peter M. Groen / dali-demo

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

Change-Id: I6a266274f476748bf34a97652964f501f44fe00c

Change-Id: I18d69dba01824ffaa1cd3a4c6b9ead3a38981bc7

Change-Id: If1cef63c5c63a2c4278406856e5701ef1abbcf82

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

Change-Id: I4a723457a7cfaca87a20f771aa64f187ea160453