Fixed conflicts
Merge branch 'master' of github.com:miohtama/LibertyMusicStore
Merge branch 'master' of github.com:miohtama/LibertyMusicStore
Optimized assets