2013-03-11: licensing files added
Merge branch 'master' into integration
Merge branch 'integration' into kreincke