Unit tests
Merge branch 'master' of github.com:barif/Meeting
Merge branch 'master' of github.com:barif/Meeting
Merge branch 'master' of github.com:barif/Meeting
Small fixes