Modify app/views/reserved_addresses/new.html.erb
Add a helper method in vlans_controller to be called from views
Merge branch 'master' of https://github.com/goodmaoxixi/IPAMS into develop
Merge branch 'develop'