Version1 merge with home local

@ 3/12/13 merge to home local