bug fix 1
Merge branch 'master' into feature1

Conflicts:
	src/com/azman/androidsensor/backgroundService.java