retrieve bos javadoc
fix classpath
fix classpath
fix classpath
fix build.properties and .classpath
BS-2755
expressionCantBeEmpty=Expression content cannot be empty

Conflicts:
	bundles/plugins/org.bonitasoft.studio.properties/src/org/bonitasoft/studio/properties/sections/general/ExpressionNotEmptyValidator.java
Merge remote-tracking branch 'origin/master' into MasterBugFixing

Conflicts:
	bundles/plugins/org.bonitasoft.studio.diagram/.classpath
BS-7005
Use a variable for about text year
Merge remote-tracking branch 'origin/MasterBugFixing' into BS-2861

Conflicts:
	bundles/plugins/org.bonitasoft.studio.diagram/.classpath