Django upgraded to 1.6. This commit is for pull al the changes of the rest of collaborators and upgrade their code to the Django 1.6 changes.
Query builder ready for the test version of Sylva.
More improvements in the models and files related to the analytics. We are testing all the changes little by little to see that all work correctly.
Merged @davidmichaelbrown conflicts