- finally finished the handler
Merge branch 'android-dev' into merge

Conflicts:
	BoxLabApp/src/com/hva/boxlabapp/MainActivity.java
Merge branch 'merge'