Merge tag '14-08-11' into develop

Creating release branch 14-08-11
Adding Conditional Fields module.
Adding new template for judging pullsheet.
Updating .gitignore to ignore .ftpquota from remote hosting.
Updating Mollom module.
Merge branch 'release/14-09-03'