Remove active admin assets as they cause probems with jquery tabs
Revert "better url validator for link model"

This reverts commit 8596c2c81ae4f392ccf0c70c77832f53b95c2b22.
fix: Static pages are editable again
Merge branch 'master' into dev

Conflicts:
	Gemfile.lock
fix: Update the path to @sheerun’s globalize3 fork
fix: Make the search info popover display correctly
Merge branch 'dev' into staging

* dev:
  fix: Make the search info popover display correctly
  fix: Update the path to @sheerun’s globalize3 fork
  fix: Static pages are editable again
  Revert "better url validator for link model"
  Remove active admin assets as they cause probems with jquery tabs