[UPGRADE] python3 and django 1.7 update, big clean up in code