real jsons
.
..
functions fixed
Conflicts resolved, new events and services