added prototype blocks for uploadify
updated some doc
[Captcha] added a way to pass options when refreshing the image
Merge branch '2.1'
Revert "[Captcha] added a way to pass options when refreshing the image"

This reverts commit 3aed2d12fa5e32bf3cafc39ac929cff20c08367a.
Merge branch '2.1'
[Captcha] not using default options when refreshing
Merge pull request #194 from bamarni/2.1

[Captcha] not using default options when refreshing
Typo fix
Merge branch '2.1'
added jquerydate prototype block
Merge branch '2.1'
fixed regression from previous commit
Fix inheritance of FormExtension
Merge pull request #205 from Strate/2.1

Fix Fatal Error: Call to a member function getStream() on a non-object
Add support for model transformer into the select2
Merge branch '2.1'