background process
Merge remote-tracking branch 'origin/master'

Conflicts:
	tablet/src/main/java/org/menesty/ikea/tablet/TabletActivity.java
	tablet/src/main/java/org/menesty/ikea/tablet/task/UploadDataTask.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	tablet/src/main/java/org/menesty/ikea/tablet/TabletActivity.java
	tablet/src/main/java/org/menesty/ikea/tablet/task/UploadDataTask.java