trailing space
add pundit gem and controller
add mechanism for pundit
merge PR #959
Merge branch 'master' into pundit

Conflicts:
	spec/spec_helper.rb
FIX Test after master merging
continue on site controller, avoid ability
Add policy for Site#Create
Finalize SiteController
remove stub, i prefer use in-place mechanism
missing update, update needs find resource by id
add missing policy
add policy on snippet controller
Add Policy to Pages Controller
add new flags (burkina faso + madagascar)
Update admin_ui.es.yml #960
exporting empty belong_to field does not break the whole csv
add ukrainian locale
Merge remote-tracking branch 'timsly/uk-locale' into v2.5.x
Revert "Merge remote-tracking branch 'timsly/uk-locale' into v2.5.x"

This reverts commit f886e983ce6b9a11917947c8c845b5e8f7773b25, reversing
changes made to a104ef28a7fe44300395afa59163e449ead61968.