Merge branch 'hotfix/ipad-fix1'
Merge branch 'release/r14'
Merge branch 'release/r6'
codeschool 6
Merge branch 'hotfix/codes' into develop