modified Database class
cleaned
added NetWork
Merge branch 'master' into loba_devClient
Merge branch 'loba_devClient'