Merge branch 'hotfix/fix_template_errors' into develop
Merge branch 'hotfix/fix_some_errors' into develop
Merge branch 'hotfix/minor_css_edit' into develop
Merge branch 'hotfix/fix_stat_display_logic' into develop
added private site switch
Merge branch 'release/release20140629'