a
Merge branch 'master' of https://github.com/smallcampus/SmartRecycleV2

Conflicts:
	SmartRecycleV2/src/com/example/smartrecyclev2/fragment/CustomerMainFragment.java
a