Merge branch 'release/release-2-17-2014_1_5_9' into development
Ready to merge into dev
BPFD-400 fix group and browser not showing
Remove dpm
release
remove debug
Changelog
Remove the javascript tag default for now
Merge branch 'release/release-2-26-2014_1.6.0'