add login functionality
add .json to api urls
Merge branch 'fix-api-urls'
Merge branch 'authentication'

Conflicts:
	app/actions.js
	app/views/app.jsx