Some menu's updated
Splash Screen Added
Merge remote-tracking branch 'remotes/origin/master' into jovi_branch
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/firefly/project/ActivityProducts.java