fixed parse error
addView basic framework
add some minor details
Merge remote-tracking branch 'origin/appdevBranch' into appDevBranch
merge branch