USTEST2013

Fixing the navigation.
US4444: Added westin's cat
Merge branch 'Step2'
US5555: Adding awesome search
Merge branch 'StepTres'
US5959: Added catnip
Merge branch 'Part1'
Merge branch 'Step4'
Merge branch 'master' into fresh