adding Settings
Merge branch 'master' of https://github.com/kitinfo/Android-Application
now we can reset the database but get the data immediately from server