Added conditional for adding type 'encrypted_string'
Merge pull request #5 from zachbadgett/bundle-boot-fix

Added conditional for adding type 'encrypted_string'
Merge remote-tracking branch 'github/master' into develop

Conflicts:
	OrkestraApplicationBundle.php