some merge... Merge branch 'master' of github.com:MCSN-project2014/APproject
some merge...
Merge branch 'master' of github.com:MCSN-project2014/APproject

MCSN-project2014/APproject,MCSN-project2014/APproject