missing serialVersionUID
Adding editor notes
Merge remote-tracking branch 'origin/master' into glassfish4

Conflicts:
	wegas-core/src/main/java/com/wegas/core/persistence/variable/VariableDescriptor.java