Merge branch 'master' of https://github.com/cosmin1123/Panic-Helper

Conflicts:
	src/ninja/PanicHelper/MainActivity.java