Sync to fix login
Merge branch 'master' of https://github.com/A-StadLabs/aos

Conflicts:
	public/apps/aos-info/aos-info.html