Fixes #4723: Adds an explicit restart of tomcat to the reset script
to ensure that tomcat is restarted before db:seed is run.
fixes #4767 - fixing content view search
Fixes #4784: Replaces development setup documentation with references to
katello-devel-installer and katello-deploy.
Fixes #4501: rename katello JS i18n/mark translated bastion strings.

There was a javascript error on all katello pages when mark_translation was
turned on.  This was because katello was overwriting foreman's i18n global
var with it's own global var.  Renamed katello's global var to fix this.

Also added Xs around bastion strings marked for translation.
fixes #4780 - fixing link to system errata details

I believe this was caused with the upgrade to angular which
broke the way we were using isolate scope
fixes #4773 - Content Views: fix issue which did not allow for multiple errata ids per filter

The erratum filter rule 'types' is a serialized array.  The scope
that was placed on the model was incorrectly looking for 'nil';
however, with a serialized type, we really need to fetch the records
to look at the value of 'types', as the value for an existing
rule will not be 'nil', even when types is not specified.
Merge pull request #3870 from ehelms/fixes-4784

Fixes #4784: Replaces development setup documentation with references to
Merge pull request #3840 from ehelms/fixes-4723

Fixes #4723: Adds an explicit restart of tomcat to the reset script
Merge pull request #3864 from bbuckingham/issue-4773

fixes #4773 - Content Views: fix issue which did not allow for multiple errata ids per filter
Merge pull request #3872 from jlsherrill/errata_details

fixes #4780 - fixing link to system errata details
Merge pull request #3873 from daviddavis/temp/20140324081600

Fixes #4793 - Fixed typo in activation key show
Merge pull request #3857 from daviddavis/temp/20140320170446

refs #4689 - Handle default content views in API/CLI
Merge pull request #3869 from waldenraines/bug-4501

Fixes #4501: rename katello JS i18n/mark translated bastion strings.
Merge pull request #3861 from jlsherrill/cv_search

fixes #4767 - fixing content view search failure
Refs #4798 - Fixing the subscription API