add test3
add test4
bug fix
add cvs file
Merge branch 'mvc-developement'
merge