x
Merge branch 'master' of https://github.com/Indigerd/Asgard
massive refactoring due to new framework structure based on namespaces and compatible with PSR-0 standart
Merge branch 'master' of https://github.com/Indigerd/Asgard

Conflicts:
	lib/vendor/Asgard/Asgard.php
	lib/vendor/Asgard/Controller/Controller.php
	lib/vendor/Asgard/Helper/UriHelper.php
	lib/vendor/Asgard/Template/Native.php
	www/MyApp/view/test.php
	www/templates/test/edit.html
	www/templates/test/index.html