Merge branch 'release/release-1-22-2014_1_5_3' into development
Merge branch 'hotfix/hotfix-bpfd-315' into development
BPFD 315
Add larger '#maxlength' to the field
Merge branch 'hotfix/bpfd-316'
Merge branch 'hotfix/bpfd-316' into development
C log
Merge branch 'development'