Removing setTimeout from sticky nav directive
Merge branch 'dev'