update form builder to only use return val if it's a string

This closes #2192 by updating the fix for #887 to simply drop any
return value that isn't a string.
Merge 'unencapsulate-css-global-reset' of github.com/tinynumbers/active_admin

Conflicts:
	app/assets/stylesheets/active_admin/_base.css.scss
	lib/generators/active_admin/assets/templates/3.1/active_admin.css.scss
Default `rake` to `rake test`

The previous default was `rake parallel_tests`.

Parallel are awesome, but are failing on master right now (could be setup related, I don't know).

In any case, I'm not against parallel_tests, I'm just proposing that they not be the default.
Added a note about implementation details so if a page has a custom embedded form users have been at least warned of the consequences
update .gitignore with new RVM file names
Fix mass-assignment error caused by Devise 3.0.0

See plataformatec/devise#2515 for more information
update Travis to test Rails 3.2.14
add favicon support
Merge pull request #2348 from quikly/favicon-feature

add favicon support
#2388: lock down database_cleaner to <= 1.0.1
fix typo in docs for #2363
adding the pagination_count option for index page #2283
Merge pull request #2333 from joseluistorres/issue_with_count_for_big_tables_2283

adding the pagination_count option for index page #2283
solved_issue_rake_docs_build
Better error message for missing input type

Copy/Pasted from Formtastic :P
link to user profile in the navbar

Some of our tests create a new namespace, but don't register a page for
admin users. This commit updates them so they don't fail.
ActiveAdmin::Resource loads resources for breadcrumbs

Closes #2266

Add `ActiveAdmin::Resource#find_resource`. This is now a centralized place to
load a resource, with correct handling of primary key, decoration, etc.

Then, use this new way of loading resources in the Breadcrumbs logic.
This was the original impetus for for defining
`ActiveAdmin::Resource#find_resource`. Previously, the `BreadcrumbsHelper`
did a one-off load of the resource, which has historically been a source of
bugs and/or inconsistencies.

Please note that this is duplication with InheritedResources. Normally, the
resource is loaded by InheritedResources, but there are situations in which
ActiveAdmin needs to load resources as well (ie Breadcrumbs). It was not
reasonable to use InheritedResources to load the resource (see the discussion
at https://github.com/gregbell/active_admin/pull/2315).
Merge pull request #2315 from carnesmedia/config_loads_resource

ActiveAdmin::Resource loads a resource for breadcrumbs
add skip_filter to config
Prevent panels from escaping HTML safe titles

Panels concatinate a non-html_safe, empty string with the title provided. The
resulting new string is always considered unsafe and prevents titles with
HTML from being rendered. This fixes the issue by starting with a html_safe
empty string.