Delete the redundant ip_management20141020a.xls
Merge branch 'develop'
Merge branch 'develop'
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'
Integrate bootstrap-x-editable-rails with bugs
Implement in-place editing in Reserved Address views
Merge branch 'master' of https://github.com/guanglindu/ipams
Rewrite UI based on Bootstrap 3
Rewrite the UI code based on Bootstrap 3

Merge branch 'develop' which is based on Bootstrap 3 hereafter.
Implementing import/export feature
Add gem rails-bootstrap-forms
Implementing import/export
Implementing importing
Add icons to Reserved Address List
Merge branch 'develop'