Return current_user after sign in
Merge remote-tracking branch 'origin/api' into front-end

Conflicts:
	app/views/static_pages/home.html.erb
Fix login
Little design