testing fixes
Merge branch 'master' of github.com:stephenrouse/heidi
carousel bug fixes
Merge branch 'master' of github.com:stephenrouse/heidi