change htaccess rewrite condition
remove rewrite for now
Merge branch 'release/1.1'