Allow to have multiple items with different types.
Improves tests for order item base
Merge pull request #253 from cookiekiller/master

Allows multiple items with different types: Implements logic to detect conflicts and prevents them
Removes workaround for phpunit 3.4 as it's no longer supported and creates a lot of additional, empty tests
Merge pull request #260 from dahoffmann/master

Translates new error messages
Merge https://github.com/Arcavias/arcavias-core
Moves junit log config to XML file and repeats performance tests five times
Merge pull request #261 from nsendetzky/master

Minor improvements and removes workaround for phpunit 3.4
Fixes missing brace in CSS file resulting in missing autocomplete styles
Fixes white spaces
Merge pull request #262 from nsendetzky/master

Fixes missing brace in CSS file resulting in missing autocomplete styles
Fixes displaying the category label instead of the name, especially if no start category was chosen
Merge pull request #263 from nsendetzky/master

Fixes displaying the category label instead of the name, especially if no start category was chosen
Fixes lint warnings
Removes unused constructor
Merge pull request #264 from nsendetzky/master

Minor improvements
Synchronizes confirmatio e-mail CSS
Merge pull request #265 from nsendetzky/master

Synchronizes confirmatio e-mail CSS
Removes transifex --mode option as it's not widely supported yet and old versions fail
Merge pull request #266 from nsendetzky/master

Removes transifex --mode option as it's not widely supported yet and older versions fail