2013-12-31: flat cc-by-sa license text added
Merge branch 'integration'
branche file
chg: project.version = 0.4.0; kb = software-stack-demo-kb.xml
fixed branche-flag-file
Merge remote-tracking branch 'origin/integration'
Merge remote-tracking branch 'origin/master' into mjuliano
fixed branch-flag-file