Some strings are hardcoded in crypsis layouts files
Branch updated and conlfict fixed
Merge pull request #2264 from xillibit/k31_bugs15

Some strings are hardcoded in crypsis layouts files