lll
llsl
Merge branch 'master' of github.com:im-mantis/elementary

Conflicts:
	example/edje_example
	example/edje_example.edc
	example/edje_example.edj
del file
del file