Merge branch 'feature/file-size' into develop
Ensures Django 1.6 version.
Fixes upload filename test due to django 1.6.7 update.
Makes reproductible list tests.
Merge branch 'feature/1.6.7-tests-enhancement' into develop