Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
updated Readme
stray code removed
added project name to readme.html
Merge branch 'master' into dev