Merge branch 'hotfix/bpfd-250'
Merge branch 'develop'
Added user redirect if not on own page
Merge branch 'hotfix/bpfg-295'
Merge branch 'hotfix/bpfg-295' into develop
quick fix for bpfd-295
Quick fix for bpfd-295 to deal with group in the url as well Merge branch 'develop'
Merge branch 'master' into develop
touchup work
Merge branch 'release/release-1-21-2014_1_5_2' into develop