2013-12-10: update of w7-lamp-demo-documentation
Merge remote-tracking branch 'origin/integration' into mjuliano