Merge remote branch 'upstream/master' into row-focus

Charles McNulty

2013-11-04 d1a7952c6b83f93aeac02869ff9342310c342dc1

1
2
3
4
<IfModule mod_rewrite.c>
RewriteEngine On
RewriteRule !^(js|resources) - [F]
</IfModule>