This hopefully fixes the silly questions issue (#871)
Please check.
Fixes tinyZenpage right wrap
Some more changes concerning #871
Please check
Simplified  explanatory texts for #871
Merge remote-tracking branch 'upstream/master'

Another zenphoto change to ignore. The chanlenge question change is simply bad security. The tinyZenpage is probably ok, but we have de-emphasized tinyZenpage as a bad implementation in the first place.

Conflicts:
	zp-core/lib-auth.php
	zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/js/dialog.php
fix non-object error
12.2.2014
Merge pull request #229 from sbillard/master

12.2.2014