Missed out a file from my previous commit.
Merge pull request #26 from manojgn/CleanupBranch

Missed out a file from my previous commit.
Merge pull request #7 from Juniper/master

Pull changes from Juniper/web-controller to absingla/web-controller