Merged changes.
tree: bc8a992c582f62ef063274a47e909f00d5335874
  1. .hgignore
  2. application/
  3. index.php
  4. license.txt
  5. system/
  6. user_guide/