Merge feature and macro updates, ConE configuration and fixes for bugs 301 and 427.
<?xml version="1.0" encoding="UTF-8"?>
<configuration xmlns="http://www.s60.com/xml/confml/2" xmlns:xi="http://www.w3.org/2001/XInclude">
<xi:include href="convertpluginlayer/root.confml"/>
</configuration>