Fixed issues with files in wrong place
merge conflict resolved
changes to string.xml
changes to string.xml
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

# By ngoctung4him
# Via ngoctung4him
* 'develop' of https://github.com/ehis/SmartShop:
  edit some color

Conflicts:
	src/main/res/values/strings.xml
resolved conflict with strings.xml added signup validation
Merge branch 'develop' of https://github.com/ehis/SmartShop into develop

Conflicts:
	src/main/java/com/mobile/smartshop/Inventory.java
	src/main/java/com/mobile/smartshop/ListActivity.java
	src/main/java/com/mobile/smartshop/ShopActivity.java
Removed background.png and search icon on action bar