Initial template changes for django 1.6 migration
Support for django 1.6 and update dependencies.
Merge branch 'develop' into django-16
Model fixes for django 1.6
Merge branch 'django-16' into develop
Merge branch 'develop' of github.com:marbindrakon/eve-wspace into develop