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
Images out of database #115, fix error on resize image
Meal List #76, hide meals in past
Merge branch 'testing' into master

Conflicts:
	protected/components/Functions.php
add copyright notice to all files
Merge branch 'unstable' into testing

Conflicts:
	protected/config/entw.php
Create README.md
Update README.md
ignore images
CookAssistant communication with middleware
CookAssistant, save current state in memcached instead of session
fix error in profiles model
optimice SyncController
Merge branch 'master' into testing
add my machine link logic #135
Merge branch 'unstable' into testing