Modify the page layout template, application.html.erb

1. Create the initial page layout with application.css.scss: a top banner, a left side and the main part.
2. Shrank the original rails.png to rails_small.png to use it as an indication of this being a rails app.
Modify the field type of static_ip_start and static_ip_end in table vlans.

1. Change their their original integer type to string typle by rolling back the db.
2. Modify the ipams-tables20141020a.xls accordingly.
Resolve format conflict in lans.css.scss.
Create the page layout in application.html.erb.
Initial implementation of table vlans.
Merge branch 'vlans' into develop

1. Merge branch welcome, the portal and initial layout.
2. Merge Li Jia's table border css code from lans.css.scss.
3. Initially implement VLAN creation and display.

Conflicts:
	app/controllers/vlans_controller.rb
	app/views/lans/show.html.erb
	architecture/ipams-tables20141020a.xls
	db/schema.rb
	test/fixtures/vlans.yml
Align the text field in app/views/lans/show.html.erb

1. Make the text fields aligned with CSS type selector label in lans.css.scss.
2. Bug to be fixed: app/views/lans/show.html.erb shows the params[:vlan_id] hash.
   Cannot find why at present.
Fix the bug that Hash params[:id] shows on the .../views/lans/show.html.erb

The = mark inside <%= @lan.vlans.each do |vlan| %> cause the Hash appear in html.
Create app/views/vlans/show.html.erb

1. Fix several small html code bugs concerning the views.
2. Implement the Destroy action of a VLAN record.
3. Implementing the Show and Edit actions of a VLAN record.
The vlans has been created
Minor modification to application.html.erb
Implement the VLAN record editing.
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
Seed child table vlans and implement show/edit of a VLAN
Create tables departments and users and modify the ERD in dia file and xls file
Improve the LAN and VLAN show.html.erb files
Correct ERD errors in ipams-architecture20141020a.dia
Create addresses, reserved_addresses and histories tables.

1. Create the models of the above-mentioned tables;
2. Create controllers to show the vlans, users, addresses info on a dedicated views, repectivel (vlans_perspective, users_perspective, addresses_perspective).
Correct minor errors in ERD (dia file & models) and migration