User

I am merging these to branches in order to pull the code to my local repo via the MASTER

/Dávid