.
Merge remote-tracking branch 'upstream/master'
Merge pull request #100 from kiranhugo/master

Changes in Change Plan And Device Swap