Fixes issue where running 'rake katello:reset' wouldn't always reset
the Candlepin database correctly.

Prior to this patch, the reset script assumed the existence of 'tomcat6'
which is not always the case. On most Fedora's, tomcat is under 'tomcat'
which resulted in the service never being stopped and Candlepin database
not being properly reset. This updates the task to check which tomcat
is installed and use it.
Merge pull request #3532 from ehelms/update-setup-task

Fixes issue where running 'rake katello:reset' wouldn't always reset
Bastion: Initial pass at subscriptions UI
Fix less parse error by removing bastion stylesheets from assets, fixes #3536

The issue here was that the less parser was trying to import the bootstrap
scss in foreman and was obviously unable to parse it because it was less
instead of scss.
Merge pull request #3520 from daviddavis/temp/20131217133321

Bastion: Initial pass at subscriptions UI
Merge pull request #3538 from waldenraines/fix-assets

	Fix less parse error by removing bastion stylesheets from assets, fixes #3536
Load foreman config in katello:reset rake task

The rake task katello:reset was failing during seeding, because
the admin user being created didn't have an email address.

This was because the foreman config settings weren't being loaded
before running db:seed.

I also added a test indicating that email is a required attribute.
Bastion: Updated ngUpload

New release contains fixes for firefox that we need for gpg key,
repo and subscription pages
Merge pull request #3542 from parthaa/ng-upload

Bastion: Updated ngUpload
api v2 systems_controller - systems actions
Merge pull request #3514 from komidore64/systems-cont

api v2 - systems actions
Merge pull request #3537 from mkelley33/seed-admin-email

Add email for admin user to seeds
Merge branch 'master' into provider-command

Conflicts:
	app/controllers/katello/api/v2/providers_controller.rb
	app/views/katello/api/v2/providers/show.json.rabl
	config/routes/api/v2.rb