Re-indent correctly all files in Crypsis template
fix conflict
Merge pull request #1485 from xillibit/k30_bugs10

Re-indent correctly all files in Crypsis template