The vlans has been created
Create model for reserved addresses
Resolve all the conflicts
Merge branch 'develop' of https://github.com/guanglindu/ipams into reserved
Merge branch 'develop' of https://github.com/guanglindu/ipams into reserved
Merge branch 'develop' of https://github.com/guanglindu/ipams into reserved
Add some i18n code
reset git 20141127
Delete the vlans, users, addresses perspective controllers
Resolve lan_id finding in vlans_controller
Delete address_controller & create addresses_controller
Merge contribution on lan_id finding from Lijia