fix issues in service app
Merge remote-tracking branch 'origin/master'
fix issues in voting app