solved last conflict in views.py
Merge branch 'master' of github.com:wellincall/charts_test_api_SRC