Implement VLANs import ugly with Bootstrap UI
Merge branch 'master' of https://github.com/goodmaoxixi/ipams into import
Implement VLAN importing ugly based on Bootstrap UI
Add bootstrap to Departments and Addresses
Add validation
Merge branch 'develop' of https://github.com/goodmaoxixi/IPAMS into ljdev
Fix Li Jia's department editing cannot save bug
Modify addresses_controller
Implementing importing from within the controllers
Resolve the i18n warning in i18n.rb
Merge branch 'develop' of https://github.com/guanglindu/ipams into develop
Implement reserved address destroying
Revise VLAN importing code
Merge branch 'develop' of https://github.com/goodmaoxixi/ipams into import
Modify reserved_addresses_controller
Improving VLAN importing code
Merge branch 'develop' of https://github.com/goodmaoxixi/IPAMS into import
Add Unit Testing to model lan
Supplement the testing code
Add some model vlan unit tests