add uyan and google-analysis
Merge remote-tracking branch 'origin/master'
little modifying
Merge remote-tracking branch 'origin/master'
modify views