Use partials to rewrite the lans and vlans view
Merge branch 'develop' of https://github.com/guanglindu/ipams into develop

Resolve the following conflict.
Conflicts:
	app/controllers/vlans_controller.rb