Tag bos-studio-6.4.0_TEST-201411111540 from ci
Revert trunk snapshot version
Tag bos-studio-6.4.0.alpha-01-201411111900 from ci
Revert trunk snapshot version
Merge branch 'master' into 'BS-9216_LivingAppMenu_v2'