Changes to be committed:
	modified:   Gemfile
modified:   Gemfile.lock
	new file:   app/assets/images/bootstrap-formhelpers-countries.flags.png
	new file:   app/assets/javascripts/bootstrap-formhelpers-countries.en_US.js
	new file:   app/assets/javascripts/bootstrap-formhelpers-countries.js
	new file:   app/assets/javascripts/bootstrap-formhelpers-languages.codes.js
	new file:   app/assets/javascripts/bootstrap-formhelpers-languages.js
	new file:   app/assets/javascripts/bootstrap-formhelpers-phone.format.js
	new file:   app/assets/javascripts/bootstrap-formhelpers-phone.js
	new file:   app/assets/javascripts/bootstrap-formhelpers-selectbox.js
	new file:   app/assets/javascripts/bootstrap-formhelpers-states.en_US.js
	new file:   app/assets/javascripts/bootstrap-formhelpers-states.js
	new file:   app/assets/stylesheets/bootstrap-formhelpers-countries.flags.css
	new file:   app/assets/stylesheets/bootstrap-formhelpers.css
	modified:   app/controllers/ip_addresses_controller.rb
	modified:   app/models/ip_address.rb
	modified:   app/views/ip_addresses/edit.html.erb
	new file:   db/migrate/20121026015419_fix_dns_device_assoc_make_nullable.rb
Merge branch 'develop' of https://github.com/amalvagomes/ip-database into develop

Conflicts:
	Gemfile
Merge branch 'develop' of https://github.com/amalvagomes/ip-database into develop

Conflicts:
	app/views/ip_addresses/edit.html.erb
	deleted:    ../assets/javascripts/bootstrap-formhelpers-countries.en_US.js
	deleted:    ../assets/javascripts/bootstrap-formhelpers-countries.js
	deleted:    ../assets/javascripts/bootstrap-formhelpers-languages.codes.js
	deleted:    ../assets/javascripts/bootstrap-formhelpers-languages.js
	deleted:    ../assets/javascripts/bootstrap-formhelpers-phone.format.js
	deleted:    ../assets/javascripts/bootstrap-formhelpers-phone.js
	deleted:    ../assets/javascripts/bootstrap-formhelpers-selectbox.js
	deleted:    ../assets/javascripts/bootstrap-formhelpers-states.en_US.js
	deleted:    ../assets/javascripts/bootstrap-formhelpers-states.js
	deleted:    ../assets/stylesheets/bootstrap-formhelpers-countries.flags.css
	deleted:    ../assets/stylesheets/bootstrap-formhelpers.css
modified:   ../assets/javascripts/ip_addresses.js.erb
	modified:   ../assets/stylesheets/theme.css.erb
	modified:   dns_device_assocs_controller.rb
	modified:   ip_addresses_controller.rb
	modified:   ../models/dns_device_assoc.rb
	modified:   ../models/ip_address.rb
	modified:   ../views/ip_addresses/edit.html.erb
	modified:   ../../config/routes.rb
	new file:   app/assets/images/switch.png
	modified:   app/assets/javascripts/ip_addresses.js.erb
	new file:   app/assets/javascripts/jquery.autocomplete.js
	new file:   app/assets/javascripts/jquery.multi-select.js
	new file:   app/assets/javascripts/jquery.quicksearch.js
	new file:   app/assets/stylesheets/multi-select.css
	modified:   app/assets/stylesheets/theme.css.erb
	modified:   app/controllers/dns_device_assocs_controller.rb
	modified:   app/controllers/ip_addresses_controller.rb
	modified:   app/models/dns_device_assoc.rb
	new file:   app/models/dns_ip_join.rb
	modified:   app/models/ip_address.rb
	modified:   app/views/ip_addresses/edit.html.erb
	modified:   config/routes.rb
	new file:   db/migrate/20121111012722_create_dns_ip_join_table.rb
new file:   db/migrate/20121111013653_update_dns_device_assocs.rb
Merge branch 'develop' of https://github.com/amalvagomes/ip-database into develop

Conflicts:
	app/assets/javascripts/ip_addresses.js.erb

	modified:   Gemfile
	modified:   app/assets/javascripts/application.js
	modified:   app/assets/javascripts/device_types.js.erb
	modified:   app/assets/javascripts/dhcp_ranges.js.erb
	modified:   app/assets/javascripts/dns_device_assocs.js.erb
	modified:   app/assets/javascripts/ip_addresses.js.erb
	modified:   app/assets/javascripts/networks.js.erb
	modified:   app/controllers/application_controller.rb
	modified:   app/models/device_type.rb
	modified:   app/models/dhcp_range.rb
	modified:   app/models/dns_device_assoc.rb
	modified:   app/models/ip_address.rb
	modified:   app/models/network.rb
	modified:   app/models/notification.rb
	modified:   app/views/device_types/edit.html.erb
	modified:   app/views/device_types/index.html.erb
	modified:   app/views/device_types/new.html.erb
	modified:   app/views/device_types/show.html.erb
	modified:   app/views/dhcp_ranges/new.html.erb
	modified:   app/views/dns_device_assocs/index.html.erb
	modified:   app/views/dns_device_assocs/show.html.erb
	modified:   app/views/networks/index.html.erb
	modified:   app/views/networks/show.html.erb
	new file:   doc/app/ApplicationController.html
new file:   doc/app/ApplicationHelper.html
	new file:   doc/app/DeviceType.html
	new file:   doc/app/DeviceTypesController.html
	new file:   doc/app/DeviceTypesHelper.html
	new file:   doc/app/DhcpRange.html
	new file:   doc/app/DhcpRangesController.html
	new file:   doc/app/DhcpRangesHelper.html
	new file:   doc/app/DnsDeviceAssoc.html
	new file:   doc/app/DnsDeviceAssocsController.html
	new file:   doc/app/DnsDeviceAssocsHelper.html
	new file:   doc/app/IpAddress.html
	new file:   doc/app/IpAddressesController.html
	new file:   doc/app/IpAddressesHelper.html
	new file:   doc/app/Network.html
	new file:   doc/app/NetworksController.html
new file:   doc/app/NetworksHelper.html
	new file:   doc/app/Notification.html
	new file:   doc/app/NotificationsController.html
	new file:   doc/app/NotificationsHelper.html
	new file:   doc/app/created.rid
	new file:   doc/app/doc/README_FOR_APP.html
	new file:   doc/app/images/add.png
	new file:   doc/app/images/brick.png
	new file:   doc/app/images/brick_link.png
	new file:   doc/app/images/bug.png
	new file:   doc/app/images/bullet_black.png
	new file:   doc/app/images/bullet_toggle_minus.png
	new file:   doc/app/images/bullet_toggle_plus.png
	new file:   doc/app/images/date.png
	new file:   doc/app/images/delete.png
	new file:   doc/app/images/find.png
	new file:   doc/app/images/loadingAnimation.gif
new file:   doc/app/images/macFFBgHack.png
	new file:   doc/app/images/package.png
	new file:   doc/app/images/page_green.png
	new file:   doc/app/images/page_white_text.png
	new file:   doc/app/images/page_white_width.png
	new file:   doc/app/images/plugin.png
	new file:   doc/app/images/ruby.png
	new file:   doc/app/images/tag_blue.png
	new file:   doc/app/images/tag_green.png
	new file:   doc/app/images/transparent.png
	new file:   doc/app/images/wrench.png
	new file:   doc/app/images/wrench_orange.png
	new file:   doc/app/images/zoom.png
new file:   doc/app/index.html
	new file:   doc/app/js/darkfish.js
	new file:   doc/app/js/jquery.js
	new file:   doc/app/js/navigation.js
	new file:   doc/app/js/search.js
	new file:   doc/app/js/search_index.js
	new file:   doc/app/js/searcher.js
	new file:   doc/app/rdoc.css
	new file:   doc/app/table_of_contents.html
	new file:   erd.pdf
	modified:   test/fixtures/device_types.yml
	modified:   test/fixtures/dhcp_ranges.yml
	modified:   test/fixtures/dns_device_assocs.yml
	modified:   test/fixtures/ip_addresses.yml
	modified:   test/fixtures/networks.yml
	modified:   test/fixtures/notifications.yml
	modified:   test/unit/device_type_test.rb
modified:   test/unit/dhcp_range_test.rb
	modified:   test/unit/dns_device_assoc_test.rb
	modified:   test/unit/ip_address_test.rb
	modified:   test/unit/network_test.rb
	modified:   test/unit/notification_test.rb
Merge branch 'develop' of https://github.com/amalvagomes/ip-database into develop
Merge branch 'develop' of https://github.com/amalvagomes/ip-database into develop
	modified:   Gemfile.lock
Merge branch 'develop' of https://github.com/amalvagomes/ip-database into develop

Conflicts:
	app/views/ip_addresses/edit.html.erb

	modified:   app/assets/javascripts/application.js
modified:   app/assets/javascripts/dhcp_ranges.js.erb
	new file:   app/assets/javascripts/piechart.js
	modified:   app/assets/stylesheets/theme.css.erb
	modified:   app/controllers/dhcp_ranges_controller.rb
	modified:   app/controllers/ip_addresses_controller.rb
	modified:   app/controllers/networks_controller.rb
	modified:   app/models/dhcp_range.rb
modified:   app/models/ip_address.rb
	modified:   app/models/network.rb
	modified:   app/views/device_types/new.html.erb
	modified:   app/views/dhcp_ranges/edit.html.erb
	modified:   app/views/dhcp_ranges/index.html.erb
	modified:   app/views/dhcp_ranges/new.html.erb
	modified:   app/views/dhcp_ranges/show.html.erb
	modified:   app/views/dns_device_assocs/edit.html.erb
	modified:   app/views/dns_device_assocs/index.html.erb
	modified:   app/views/dns_device_assocs/new.html.erb
	modified:   app/views/dns_device_assocs/show.html.erb
	modified:   app/views/ip_addresses/edit.html.erb
	modified:   app/views/ip_addresses/show.html.erb
	modified:   app/views/networks/edit.html.erb
	modified:   app/views/networks/show.html.erb
	modified:   app/views/notifications/new.html.erb
	modified:   app/views/notifications/show.html.erb
	new file:   db/migrate/20121122200814_ip_address_to_binary.rb
	new file:   db/migrate/20121122202808_ip_addresses_binary_act_ii.rb
	new file:   db/migrate/20121123024357_networks_to_binary.rb
	new file:   db/migrate/20121123031130_dhcp_ranges_to_binary.rb