Issue #58 - Modal stops passing title/message/href through if modal is
canceled
Issue #58 - Modal stops passing title/message/href through if modal is
canceled
Merge branch 'issue58-modal-failure' of https://github.com/feeva/snipe-it into issue58-modal-failure
Merge pull request #113 from feeva/issue58-modal-failure

Issue #58 - Modal stops passing title/message/href through if modal is canceled
Merge branch 'localization' of github.com:feeva/snipe-it into feeva-localization

Conflicts:
	app/views/backend/layouts/default.blade.php
Merge branch 'refs/heads/feeva-localization' into develop
Minor div fix