Merge branch 'feature/#3_accounting_dialog' into develop

# Conflicts:
#	billard/models.py
#	billard/views.py

billard/views.py

@@ -1,5 +1,5 @@
 from billard.serializers import LocationDataSerializer
-from billard.models import LocationData, Location, Client
+from billard.models import LocationData, Location, Client, Accounting
 from billard.tasks import process_location_data
 from rest_framework import viewsets
 from django.shortcuts import render, redirect