Merge branch 'dev' into homepage
Add 'active' class to current page header and add auto hide flash div
Merge branch 'homepage' into dev