Merge branch 'hotfix/bpfd-357' into develop
Merge branch 'hotfix/BPFD-370' into develop
Add hooks for update a token file
touch up
Merge branch 'release/release-2-11-2014_1_5_8'