New stuff added, will fix errors...
Merge branch 'master' of https://github.com/adeelateeque/DroidShop

Conflicts:
	DroidShop-api/pom.xml