Effect of conflict resolve on merging changes from trunk, unit/integration Tests are in experiment phase so they are supposed to be skipped at this branch.
Effect of conflict resolve on merging changes from trunk, unit/integration Tests are in experiment phase so they are supposed to be skipped at this branch.

git-svn-id: 6bd94cac40bd5c1df74b384d972046d926de6ffa@15628 a8845c50-7012-0410-95d3-8e1449b9b1e4

maduhu/mifos-head,maduhu/head,jpodeszwik/mifos,vorburger/mifos-head,maduhu/mifos-head,maduhu/head,vorburger/mifos-head,AArhin/head,jpodeszwik/mifos,jpodeszwik/mifos,maduhu/head,maduhu/mifos-head,AArhin/head,maduhu/mifos-head,jpodeszwik/mifos,vorburger/mifos-head,AArhin/head,maduhu/mifos-head,AArhin/head,vorburger/mifos-head,maduhu/head,maduhu/head,AArhin/head