Merge pull request #168 from Rakeshadlagatta/master

Upgrade to angular 1.2.18
ippool and lable changes
Merge remote-tracking branch 'upstream/master'