Clean files for release.
Merge branch 'refs/heads/dev' into release

Conflicts:
	app/controllers/HomeController.php
	app/controllers/SampleController.php
	app/routes.php
	app/views/home.scout.php
Clean files for 0.9.3 release.
Merge branch 'refs/heads/dev'

Conflicts:
	app/config/controllers.config.php
	app/controllers/SampleController.php
	app/routes.php
	app/views/home.scout.php
	app/views/pages/front.scout.php
	app/views/pages/sample.scout.php
Fix merge conflicts.
Remove test files.
Pre-merge...
Merge branch 'refs/heads/dev' into release

Conflicts:
	app/config/controllers.config.php
	app/controllers/SampleController.php
	app/routes.php
	app/views/home.scout.php
	app/views/pages/front.scout.php
	app/views/pages/sample.scout.php
Clean files for release.
Merge branch 'refs/heads/release'

Conflicts:
	app/routes.php
Merge branch 'refs/heads/dev' into release
Merge branch 'refs/heads/release'
Merge branch 'dev' into release

Conflicts:
	app/admin/application.php
	app/routes.php
Merge branch 'release'
Merge branch 'dev' into release

Conflicts:
	app/admin/application.php
Merge branch 'release'
Merge branch 'dev' into release
Clean files for theme release.
Merge branch 'release'
Merge branch 'dev' into release

Conflicts:
	app/admin/application.php
	app/admin/options.php