pagination: make window_size configurable
A few typos in the french locale

Some are typos, some are suggestions.
open "Help" link on a new page
fix consume tag
a couple of core attributes of a content entry could not be updated from the UI
new (minor) version of the custom_fields gem
Merge remote-tracking branch 'upstream/master'
added spec
Changed gem dependency order
Updated Rails to 3.2.11
Added rake task to bootstrap development environment
Merge pull request #589 from andrew/rails-upgrade

Updated Rails to 3.2.11
Merge pull request #590 from Papipo/master

Rake task to setup development environment.
Merge pull request #587 from colibri-software/gem_fix

Changed gem dependency order
Merge pull request #583 from colibri-software/consume_var

fix consume tag
Merge pull request #581 from freego/master

Open "Help" link on a new page
Merge pull request #577 from Manuite/master

Typos in french language
Merge pull request #576 from exsilium/master

ET Localization fixes for Administration interface
- fixed the rspec test for the Liquid consume_tag
- merged PR #574 (Update jquery, backbone-rails and rake)
Merge pull request #563 from teefax/window_size

pagination: make window_size configurable