Merge branch 'check-login-prestashop' of https://github.com/LampTFG/Project1 into globalStyle

Conflicts:
	res/layout/login_screen.xml
	src/utils/ProductRequester.java
Merge branch 'master' into globalStyle

Conflicts:
	res/layout/login_screen.xml
	src/utils/ProductRequester.java
Merge pull request #41 from LampTFG/globalStyle

Global style