add apache vhost configuration
Change the code of some samples
idea settings
Merge remote-tracking branch 'origin/master'