basedao
network
new branch dev
fist version
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	.idea/libraries/appcompat_v7_20_0_0.xml
	.idea/libraries/support_v4_20_0_0.xml
	.idea/misc.xml
	app/app.iml
	app/src/main/AndroidManifest.xml
	app/src/main/java/cn/rspread/rajsupply/app/MyApplication.java
	app/src/main/java/cn/rspread/rajsupply/app/activities/DetailActivity.java
	app/src/main/java/cn/rspread/rajsupply/app/activities/LoginActivity.java
	app/src/main/java/cn/rspread/rajsupply/app/activities/MainActivity.java
	app/src/main/java/cn/rspread/rajsupply/app/adapter/CategoryArrayAdapter.java
	app/src/main/java/cn/rspread/rajsupply/app/adapter/ViewPagerAdapter.java
	app/src/main/java/cn/rspread/rajsupply/app/config/Config.java
	app/src/main/java/cn/rspread/rajsupply/app/dao/BaseDao.java
	app/src/main/java/cn/rspread/rajsupply/app/entities/CategoryEntity.java
	app/src/main/java/cn/rspread/rajsupply/app/entities/ProductEntity.java
	app/src/main/java/cn/rspread/rajsupply/app/utils/LogUtil.java
	app/src/main/java/cn/rspread/rajsupply/app/views/AddSampleFragment.java
	app/src/main/java/cn/rspread/rajsupply/app/views/SampleFragment.java
	app/src/main/res/layout/add_sample.xml
	app/src/main/res/layout/product_detail.xml
	mediaChooserlib/mediaChooserlib.iml
	mediaChooserlib/src/main/java/com/learnncode/mediachooser/activity/BucketHomeFragmentActivity.java
add imageDelete beta
update autoTest
add auto login
add push notice
Merge remote-tracking branch 'origin/master'