Merge branch 'dev'
hotfix: prevent PhotoUploader argument erro (serialization)
Adding relic groups: add new locale line

by fixing a typo in the name
merge production yaml
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
fix: Wrap the overflowing relic group titles properly
jQuery fix for passing locale params
Notify which locale do you currently edit
fix: Static page reload on change
Use routing-filter gem prefix locale instead locale param
Move afte_save hack for locale to tolk gem
Merge branch 'master' into dev
Add ru ans se locale
Fix photo gallery view
Merge branch 'master' into dev