MassiveSansa tmp conflict resolve
Merge branch 'master' of https://github.com/mahmuzicamel/massive-sansa