preload on Startpage / detailview #105
image prescale & caching #104, add parameter and routine for scaling
current position on maps #69, remove F5 message
script for textes in js #107, first commit
browser check not on start #90
design changes/fixes for cookAssistant overview
larger captcha image size because of german text
confirmation Mail #73
image prescale & caching #104
admin inerface #109
action out creator #110
Shoppinglist bugfix #80
Admin User #112
Admin User #112
update Recipe Editor after DB-Changes #64
show tool description in actionsOut Text #110
update CookAsisstant after DB-Changes
fix error in Mealplaner
admin interface, optimize view #109
update CookAsisstant after DB-Changes #114
Verification Mail over gmail #73
add phpMailer extention
Merge branch 'changes' into unstable
Verification Mail over gmail, fix #73
changed config file logik, there now different files for each system
only the config file for development(with all Options) is checked in.
change CookAssistant config, so there is no CookIn everycook on homepage
add default values on Actions_in #108
Change mail logic to google mail #73
Merge branch 'testing' into master

Conflicts:
	protected/config/entw.php

fix dbchanges:
	protected/data/dbchanges/2012_10_26_struct_ec.txt
	protected/data/dbchanges/2012_11_21_struct_ec.txt
	protected/data/dbchanges/2012_11_21_data_ec.txt

add dbchanges:
	protected/data/dbchanges/2013_01_10_data_ec.txt
	protected/data/dbchanges/2013_01_10_struct_ec.txt

fix path handling/dir creation in getImage in Functions.php