Rel 2 work in progress
Conflict resolved and Rel2 merged with master
Update index.html

Carol added Scale
Pulled lastest changes and merged
Rel2 completed