added htaccess to redirect to www and index.html
Merge branch 'dev'