Advocate, Client and User Settings
validation settings
validation not finished settings
Merge remote-tracking branch 'origin/David'

By ZhiYu Yang
20 Oct 2014