dev
fix order of connecting wifi
concatenating js file
fix swipe function
pushState
fix sub button
Merge branch 'develop'

Conflicts:
	public/js/min/register.min.js
	public/js/min/register.min.js.map