Flash content added to web root because root path is compiled into flash file
Merge remote-tracking branch 'origin/master'