moved everything to django 1.7 and angular 1.3 ready for master merge (api)