-Added ability to hide Member Count column
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #608 from tcavaletto/develop

As mentioned in my email to community@sparkdevnetwork, this allows the Member Count column to be hidden
- fix FileFieldType not getting EditValue correctly
- started on AudioFieldType and VideoFieldType
+ Update the Content Channel Dynamic block to allow sorting items by attribute values in addition to item properties.
+ Add a 'Delay' workflow action that will delay successful execution of action until a specified number of minutes have passed.
- fixed typo
Merge remote-tracking branch 'origin/hotfix-1.1.2' into develop
- Start workflow action for Protect My Ministry request
Merge remote-tracking branch 'origin/hotfix-1.1.2' into develop
+ Add option to RockTextBox field type for using password mode on rendered textbox and update SMTP settings and Payment Gateway settings to use password mode ( Fixes #426 )

Merge branch 'feature-dt-password' into develop
Merge remote-tracking branch 'origin/develop' into feature-dt-background-check
+ Add new Encrypted Field Type and Attribute that can be used to store sensitive attribute values as an encrypted value in database (e.g. Passwords, SSN, etc ).
+ Update the System Info block's clear cache option to also refresh the list of EntityTypes, FieldTypes, and BlockTypes.
Merge remote-tracking branch 'origin/hotfix-1.1.2' into develop
Merge remote-tracking branch 'origin/develop' into feature-dt-background-check
- Remove action for now
- Update all of the MEF containers to be consistent
- removed dotLiquid from solution as we have a 'forked' project now in a separate repo.