Update JS
Merge branch 'master' of github.com:nails/nails-admin

Conflicts:
	.cachebust
	dist/js/main.js