no message
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

# By Ehidiamen Ojielu (4) and Sean Gibeault (1)
# Via Ehidiamen Ojielu (3) and Sean Gibeault (1)
* 'develop' of https://github.com/ehis/SmartShop:
  getting scanner content and formatName in log.d(debug) logcat
  fixed error on referencing deleted scan activity
  fixed sign up and sign in page appropriate logic deleted redundant files in the different layouts
  db
  logging content of scanner on success.

Conflicts:
	src/main/java/com/mobile/smartshop/User.java