Study notes

Study notes
Merge remote-tracking branch 'origin/master'

Conflicts:
	system/core/uri.php