merge diff
Merge branch 'develop'

Conflicts:
	public/js/min/register.min.js
	public/js/min/register.min.js.map
Merge branch 'develop'

Conflicts:
	public/js/min/register.min.js
	public/js/min/register.min.js.map
fix order of wifi setting