fix month&week criteria, small fixes + lookupper fields
Merge branch 'master' of https://github.com/barif/Meeting
check conflict begin
lookupper repeatable logic. clear check_conflict logic.
Merge remote-tracking branch 'origin/master'