Merge branch 'dev' of https://github.com/iilab/PanicButton into dev
Merge branch 'dev' into alpha