First commit with all code
Merge github.com:edalonso/eMeeting-Project