modified the app layouts
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml
	app/src/main/java/project/firefly/ActivityProductDetails.java
modified the app layouts
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/project/firefly/ActivityProducts.java
	app/src/main/java/project/firefly/DatabaseHelper.java
jovi's latest commit