Rm profiles.xml for maven3 compatibility
Add metrics
Merge branch 'dev'