einige änderunge (keine ahnung wie viel)
	modified:   application/configs/application.ini
	modified:   application/controllers/IndexController.php
	modified:   application/controllers/StartseiteController.php
	modified:   application/layouts/scripts/banner.phtml
	modified:   application/layouts/scripts/layout.phtml
	modified:   application/models/Anrede.php
	modified:   application/models/AnredeMapper.php
	modified:   application/models/Benutzer.php
	modified:   application/models/BenutzerMapper.php
	modified:   application/models/DbTable/Anrede.php
	modified:   application/models/DbTable/Begriff.php
	modified:   application/models/DbTable/Benutzer.php
	modified:   application/models/DbTable/Plz2ort.php
	modified:   application/views/scripts/index/index.phtml
	new file:   public/_files/images/banner_wiederholung.png
	modified:   public/_files/images/logo_therminox.jpg
	new file:   public/_files/images/logo_therminox.png
	modified:   public/css/layout.css
Merge branch 'master' of github.com:blackravendb/therminox

Conflicts:
	application/views/scripts/_layout/banner.phtml

	modified:   application/controllers/AccountController.php
	modified:   application/forms/Login.php
	modified:   application/forms/Password.php
	modified:   application/forms/Recover.php
	modified:   application/forms/Register.php
	modified:   application/layouts/scripts/layout.phtml
	renamed:    application/layouts/scripts/account.phtml -> application/views/scripts/_layout/account.phtml
	renamed:    application/layouts/scripts/admin_letzteProdukte.phtml -> application/views/scripts/_layout/admin_letzteProdukte.phtml
	renamed:    application/layouts/scripts/banner.phtml -> application/views/scripts/_layout/banner.phtml
	renamed:    application/layouts/scripts/fusszeile.phtml -> application/views/scripts/_layout/fusszeile.phtml
	renamed:    application/layouts/scripts/menu.phtml -> application/views/scripts/_layout/menu.phtml
	new file:   library/App/Form.php