Merge pull request #10 from daniellemayne/develop

4.1 upgrades from 2013.07 branch
Merge pull request #12 from daniellemayne/develop

develop - more fixes for async polling (register template, assign ip into vlan)