updates for Lisas SA demos, added services parsing to the SyncAdapter
added a bunch of assets, final setup for the unicef/tnani showing
fixed merge conflict