Merge branch 'master' into 'BS-6898_Test_postgres_on_tomcat7'
Merge branch 'master' into 'BS-6898_Test_postgres_on_tomcat7'
Merge branch 'BS-6898_Test_postgres_on_tomcat7' into 'master'
BS-7173
Fix npe and tab size
Merge branch 'master' of git@github.com:bonitasoft/bonita-studio.git
Merge remote-tracking branch 'origin/master' into DataManagement