Merge pull request #58 from dvicini/master

improved invitations fragments, less duplicated code
more comments and renaming
Merge pull request #59 from countschokula/master

more comments and renaming
finishing stuff
resolved conflicts