tmp
Merge branch 'master' of github.com:clickalicious/DoozR

Conflicts:
	App/Presenter/Demo.php

fixed some typos, bugs, ...