Conflicts:
	extensions/bootstrap/CHANGELOG.md
	extensions/bootstrap/Nav.php

Fixes #2726: ActiveRecord now fills default values on creating new instance of the model if defaults are available from DB schema

Updated spanish translation

Update yii.php

Made Theme::basePath optional fixes #2810

Added asElapsedTime function to Formatter

fix User::getReturnUrl() after #2501

Update usage example in comments of db\DataReader

Changed comment again to actually be correct. This is also consistent with the draft of the definitive guide.

Modified example in DataReader usage comment to reference a DB Command function which accepts a SQL string argument.

Changed comment again to actually be correct. This is also consistent with the draft of the definitive guide.

Conflicts:
	framework/base/Formatter.php
	tests/unit/framework/base/FormatterTest.php

typo fix in contoller.md

fixes #2776 renamed default template folder

updated composer docs