pull on 06/02/2014
test commit
Merge branch 'master' into brLogout