Renamed some files and menu
Merge branch 'master' of https://github.com/lasshi/JollaCodecamp