Merge branch 'master' into dev
constants: turned debug back on
options: added live iframe instead of image for infoscreen preview
options: CSS for infoscreen live preview
options: loading and unloading of live infoscreen preview
options: moved unloading of infoscreen preview to a better place
Merge branch 'infoscreen-tweaks' into dev
constants: turned off debug
manifest: bumped version number
constants: enabling debug
defaults: disabling chatter
defaults: commenting
readme: added media coverage in Dusken
affiliation: code and graphics for Vivas
manifest: bumped version number
constants: turned off debug
affiliation: turned off debug
Merge branch 'dev'