updated tests.
removing old code
cleanuo
Merge remote-tracking branch 'origin/master'
improved android client