Merge branch 'feature/Benjamin' into feature/Results

Conflicts:
	BlunoBasicDemo/AndroidManifest.xml
	BlunoBasicDemo/res/values/strings.xml
	BlunoBasicDemo/src/com/example/blunobasicdemo/BlunoLibrary.java
	BlunoBasicDemo/src/com/example/blunobasicdemo/MainActivity.java
	BlunoBasicDemo/src/com/example/blunobasicdemo/Results.java