Merge branch 'master' into codeigniter3update

diff --cc CodeIgniter.gitignore
index 2d3407367523bd571a53d066699eb0db446d084a,60571a0c38300fdcff4e2259600bc924db52a50b..bfea17cdc5bbbcf74bb6b4ee9e88669154b19143
--- 1/CodeIgniter.gitignore
--- 2/CodeIgniter.gitignore
+++ b/CodeIgniter.gitignore
@@@ -5,8 -5,7 +5,13 @@@
  !*/cache/index.html
  !*/cache/.htaccess
  
+ user_guide_src/build/*
+ user_guide_src/cilexer/build/*
+ user_guide_src/cilexer/dist/*
+ user_guide_src/cilexer/pycilexer.egg-info/*
++
 +#codeigniter 3
 +application/logs/*
 +!application/logs/index.html
 +!application/logs/.htaccess
 +/vendor/