Frontpage Changes
Merge branch 'hotfix/fpjan2013'