removed staticfiles url as that was probably deprecated from Django 1.6 and removed secondary static folderin case of conflict