Fixed bugs here and there
Hybrid sorting for name/surname
Merge pull request #1 from chaireg0/master

Final version with revisions for sprint 2, ready to go