Merge branch 'master' of https://github.com/kaspp/ISPrototype

Conflicts:
application/FisheyeMenu.java
application/Main.java
Merge branch 'master' of https://github.com/kaspp/ISPrototype

Conflicts:
	application/FisheyeMenu.java
	application/Main.java