fix merge errors and indent of JavaScript file
fix merge errors and indent of JavaScript file

coffeestats/coffeestats-django,coffeestats/coffeestats-django,coffeestats/coffeestats-django,coffeestats/coffeestats-django