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

Conflicts:
	src/main/java/com/mobile/smartshop/MainActivity.java
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	src/main/AndroidManifest.xml
	src/main/java/com/mobile/smartshop/MainActivity.java
	src/main/res/values/strings.xml
fixed naming in strings.xml
Sign up activity with integration to parse db
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	src/main/AndroidManifest.xml
	src/main/java/com/mobile/smartshop/MainActivity.java
	src/main/res/layout/activity_main.xml
	src/main/res/values/strings.xml

Fixed some conflicts and merged
Removed zxing library from smartshop module
Removed new lines from gitignore
commiting db changes
commiting db changes
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	.gitignore
	src/main/java/com/mobile/smartshop/DataBase.java
Scan Activity
gitignore smartShop.iml
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	.gitignore
	smartShop.iml
	src/main/res/values/strings.xml
Fixed Scanner
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	.gitignore
added camera permission to Manifest
scanner now integrated into app without having to download barcode scanner from play store.
scanner now integrated into app without having to download barcode scanner from play store.
Added camera icon to actionbar to launch scanner.
Merge remote-tracking branch 'origin/develop' into develop
no message