ACE 09.09.2013
added new types
noconflict update
fix for split again
reflect deleted type
Merge pull request #519 from FOXITES/master

Mapped .vm to velocity format.
Merge pull request #517 from daeks/ace

Patch: Ace Upgrade to 09.09.2013
Merge pull request #1 from Codiad/master

Merged from origin.