Commit

54b4892

I stopped pushing because I feel like you guys already have your hands full xD even if one of mine kinda is important for kb people... I just make sure that the conflicts are solved.

commit 54b4892