Merge branch 'dev'
hotfix: prevent PhotoUploader argument erro (serialization)
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