Merge pull request #1 from inderdhir/inder

Inder
Merge pull request #2 from inderdhir/develop

Develop
Merge pull request #3 from inderdhir/inder

Inder
Merge pull request #4 from inderdhir/develop

Develop
Merge pull request #5 from inderdhir/inder

did some of m6
Merge pull request #6 from inderdhir/develop

Develop
done some m8
M9 completed
Fixed errors merging
So many merge fixes
Merge pull request #7 from inderdhir/shafiq

Merging shafiq into eli