Merge branch 'android-dev'
 - removed binaries and excluded them in the git ignore file
 - removed binary files, and generated resources
Merge branch 'master' into android-dev

Conflicts:
	.gitignore
 - added a start for managing sensor devices
Merge branch 'android-dev' into android-dev-libgdx

Conflicts:
	BoxLabApp/.classpath
	BoxLabApp/AndroidManifest.xml
	BoxLabApp/bin/AndroidManifest.xml
	BoxLabApp/bin/BoxLabApp.apk
	BoxLabApp/bin/R.txt
	BoxLabApp/bin/classes.dex
	BoxLabApp/bin/classes/com/hva/boxlabapp/FragmentExercises.class
	BoxLabApp/bin/classes/com/hva/boxlabapp/MainActivity.class
	BoxLabApp/bin/classes/com/hva/boxlabapp/R$id.class
	BoxLabApp/bin/classes/com/hva/boxlabapp/R$layout.class
	BoxLabApp/bin/classes/com/hva/boxlabapp/R$menu.class
	BoxLabApp/bin/classes/com/hva/boxlabapp/R$string.class
	BoxLabApp/bin/classes/com/hva/boxlabapp/R$style.class
	BoxLabApp/bin/classes/com/hva/boxlabapp/R$styleable.class
	BoxLabApp/bin/classes/com/squareup/timessquare/R$id.class
	BoxLabApp/bin/dexedLibs/rajawali-e80c933a26eb90f47bed3fe6f5312529.jar

BoxLabApp/bin/dexedLibs/timessquare-db1c2697cf7bb12c65ab41b2c91d9761.jar
	BoxLabApp/bin/resources.ap_
	BoxLabApp/gen/com/hva/boxlabapp/R.java
	BoxLabApp/gen/com/squareup/timessquare/R.java
	BoxLabApp/res/values/strings.xml
	TimesSquare/bin/timessquare.jar
stuff