[Fix] Merging,meld,rebase, cherrypick from D4rkHeart to Master

There were still some files, badly commited and modified in staging. So we now have a fully functional application