Add property method to enable use of EncryptedKey as url parameter
Merge branch 'develop'
Update NumberBox to inherit from LabeledTextBox so that can use pre,post text fields
Merge branch 'develop'
Add property method to enable use of EncryptedKey as url parameter
Update NumberBox to inherit from LabeledTextBox so that can use pre,post text fields
Fix case of 'badges 1' block name on person detail
Redo migration after Mike snuck a migration in ahead of me :)
Merge branch 'origin/feature-mp-rock-ef6beta1'
Merge branch 'origin/develop'