add add_introspection_rules to encrypted fields
Merge branch 'master' into changes
db_fields.py code cleanup (chaning 2-spaces tabs to 4-spaces)
Merge pull request #7 from Tivix/changes

Changes