modify template
modify user model
Merge branch 'master' of /home/yk/ws/ov/callboard-aggregator/callboard with conflicts.
modify user model (complete merge)