fix bug
Merge branch 'master' of https://github.com/omnbmh/pi6x

Conflicts:
	resources/js/signin.js