20140427_by_ShawnWu test v2.1 update

test v2.1 update
Revert "20140427_by_ShawnWu test v2.1 update"

This reverts commit ea84d1f7a3e3155d6b865b3b34bf20025c8878cb.
Merge branch 'master' of https://github.com/xenophon566/_myGitHub