Add authorization and organize.
Merge branch 'temp'

Conflicts:
	public/js/app.js