Show json data
Merge branch 'develop' into frontend-lifting

Conflicts:
	app/views/omniauth_callbacks/heroku.html.erb