fix conflict
Merge branch 'master' of https://github.com/DonMostro/tangerine

Conflicts:
	library/Zwei/Db/Table.php
Merge branch 'master' of https://github.com/DonMostro/tangerine