initial commit
.gitignore and vatmodel and collection to bring up to date to google code project r437
readme from google code homepage
gitignore update
README rename to README.md
config / modules / layout
Ajde_Controller::afterInvoke() not called when beforeInvoke() returned false
Ajde_Controller::afterInvoke() not called when beforeInvoke() returned false
Merge branch 'ajde' of d:/git
revert back to ajde branch
revert back to ajde branch
small changes
init
Merge branch 'master' of D:/www/ajde-git

Conflicts:
	src/.htaccess
	src/errordocument.php
	src/index.php
	src/private/.htaccess
	src/private/application/config/Config.php
	src/private/application/config/Config_Application.php
	src/private/application/config/Config_Dev.php
	src/private/application/config/Config_Live.php
	src/private/application/lang/en_GB/main.ini
	src/private/application/lang/nl_NL/main.ini
	src/private/application/layout/empty/template/default.html.phtml
	src/private/application/layout/empty/template/default.json.phtml
	src/private/application/modules/_core/_coreComponentController.php
	src/private/application/modules/_core/_coreController.php
	src/private/application/modules/_core/_coreDebuggerController.php
	src/private/application/modules/_core/res/css/debugger/view.css
	src/private/application/modules/_core/res/js/component/form/ajax.js
	src/private/application/modules/_core/res/js/component/shortcut.js
	src/private/application/modules/_core/res/js/debugger/view.js
	src/private/application/modules/_core/template/component/form/ajax.phtml
	src/private/application/modules/_core/template/debugger/view.phtml
	src/private/application/modules/main/MainController.php
	src/private/application/modules/main/model/TestCollection.php
	src/private/application/modules/main/model/TestModel.php
	src/private/application/modules/main/res/js/default.js
	src/private/application/modules/main/template/view.phtml
	src/private/lib/Ajde/Application/Application.php
	src/private/lib/Ajde/Cache/Cache.php
	src/private/lib/Ajde/Component/Crud.php
	src/private/lib/Ajde/Component/Css.php
	src/private/lib/Ajde/Component/Form.php
	src/private/lib/Ajde/Component/Js.php
	src/private/lib/Ajde/Component/Resource.php
	src/private/lib/Ajde/Controller/Controller.php
	src/private/lib/Ajde/Cookie/Cookie.php
	src/private/lib/Ajde/Core/Autoloader.php
	src/private/lib/Ajde/Core/Bootstrap.php
	src/private/lib/Ajde/Core/Route.php
	src/private/lib/Ajde/Document/Document.php
	src/private/lib/Ajde/Document/Format/Css.php
	src/private/lib/Ajde/Document/Format/Html.php
	src/private/lib/Ajde/Document/Format/Js.php
	src/private/lib/Ajde/Document/Format/Json.php
	src/private/lib/Ajde/Document/Format/Xml.php
	src/private/lib/Ajde/Dump/Dump.php
	src/private/lib/Ajde/Exception/Exception.php
	src/private/lib/Ajde/Exception/Handler.php
	src/private/lib/Ajde/Exception/Log.php
	src/private/lib/Ajde/FS/Find.php
	src/private/lib/Ajde/Http/Request.php
	src/private/lib/Ajde/Http/Response.php
	src/private/lib/Ajde/Lang/Adapter/Abstract.php
	src/private/lib/Ajde/Lang/Adapter/Gettext.php
	src/private/lib/Ajde/Lang/Adapter/Ini.php
	src/private/lib/Ajde/Lang/Lang.php
	src/private/lib/Ajde/Layout/Layout.php
	src/private/lib/Ajde/Object/Magic.php
	src/private/lib/Ajde/Object/Object.php
	src/private/lib/Ajde/Object/Standard.php
	src/private/lib/Ajde/Resource/Local.php
	src/private/lib/Ajde/Resource/Local/Compressed.php
	src/private/lib/Ajde/Resource/Local/Compressor.php
	src/private/lib/Ajde/Resource/Local/Compressor/Css.php
	src/private/lib/Ajde/Resource/Local/Compressor/Js.php
	src/private/lib/Ajde/Resource/Public.php
	src/private/lib/Ajde/Resource/Remote.php
	src/private/lib/Ajde/Resource/Resource.php
	src/private/lib/Ajde/Session/Session.php
	src/private/lib/Ajde/Template/Parser/Phtml/Helper.php
	src/private/lib/Ajde/Template/Template.php
	src/robots.txt
untracked files on master: 18408a4 Merge branch 'master' of D:/www/ajde-git
index on master: 18408a4 Merge branch 'master' of D:/www/ajde-git
WIP on master: 18408a4 Merge branch 'master' of D:/www/ajde-git
major update
edit
edits