adding some default string labels
moving away the simulation code
moving away the simulation code
Merge branch 'master' of https://github.com/kpacha/android