fixed carousel link bugs
Merge branch 'master' into stable