Merge branch 'master'
adding files
remove www files
Merge branch 'jphernandez'