fixes #3914 - set current taxonomies on login from user defaults
fixes #5157 - allowed to suggest new IP on the new host form
fixes #4122 and new charts design
fixes #5105 - remove Setting['remove_classes_not_in_environment']
fixes #5083 - refactor host_edit.js - remove puppetclass specific functions to class_edit.js
fixes #5137 - audited :associated_with labels are 'N/A' for models that have a hyphen
fixes #4204 - add config groups feature - assign multiple config groups to a host or hostgroup
fixes #5173 - sortable counters on list of config_groups for number of hosts, hostgroups and puppetclasses
fixes #5141 - User unable to access children taxonomies on switcher
Fixes #5180 - in_taxonomy clears out Taxonomy.current
i18n - extracting new, updating rails, pulling from tx
fixes #5200 - set config group counters to zero by default
fixes #5172 - typo SETTINGS[:location_enabled] instead of :locations_enabled causes default location select box not to be visible
Bump version to 1.6-develop
fixes #5214 - pin ancestry for Ruby 1.8 compatibility
fixes #5222 - Log ldap attributes in debug-level logging
fixes #1902 - audit changes to lookup keys and values/overrides
fixes #5224 - Don't update a user with blank LDAP attribute values
Merge and fix conflicts with develop branch