Testing and cleaning
Merge branch 'master' of https://github.com/adeelateeque/DroidShop