Fix rowpan error
Merge branch 'devel-marc' of https://github.com/geminux50/mmm-likewaze into devel-marc

Overriding local changes
Solve merge conflicts
Custom progress dialog no more needed
cleaning imports