Renaming stuff to fixme
Merge branch 'master' of https://github.com/dperezmavro/MAndron