Merge branch 'master' of https://github.com/LivotovLabs/3DSView

Conflicts:
	src/eu/livotov/labs/android/d3s/D3SSViewAuthorizationListener.java
	src/eu/livotov/labs/android/d3s/D3SView.java