Adding setTimeout to sticky nav directive
Merge branch 'dev'