Merge branch 'add-ordering-on-fields' into develop
Merge branch 'add-ordering-on-fields' into develop
Change static directory.
Merge branch 'fix-directory-link'