use nl2br only on text mails, not on html mails
ignore strict errors, are in E_ALL since php 5.4
Merge branch '1.8' into 1.9

Conflicts:
	Vps/Setup.php
don't extend Zend_Loader

- we don't need any features from it
- fixes strict errors
use proper operator when removing strict from error reporting
Merge branch '1.8' into 1.9

Conflicts:
	Vps/Setup.php
Merge branch '1.9' into 1.11
Implement check equals expression for expr_equals

Now it's possible to check if a field equals an expression. This way it's also
possible to compare two expressions.
Tests cover generated sql-string, used by stored exprs and used in select
Move check if value is expression to better position

Now Compare-expressions are handled the same: getting value from "getFormattedValue()"
and checking if value is expression. If it's a expression do correct handling.
Refactored for simpler understanding
Move logic to prevent quoting for an sql-statement

If the compare-value was a expression it also got quoted, but then sql won't work.
Add convert from and to array for expression as value
mark failing test incomplete
Merge branch '1.8' into 1.9
Merge branch '1.9' into 1.11
Merge branch '1.11' into 2.0

Conflicts:
	Vps/Setup.php
Merge branch '2.0' into 2.1
Merge remote branch 'origin/2.1' into 3.0

Conflicts:
	Vps/Setup.php
	tests/Vps/User/RealModelTest.php
don't report strict errors
fix statistic if piwik is not loaded (happens on test server)
use parentDataSelect for getComponentsByClass to support ignoreVisible in getAllChainedByMaster