new change
Merge remote-tracking branch 'origin/master'
development configuration modified
Merge pull request #2 from linaizhong/master

configuration for development modified