AI-581 - added skip expression to formfield

Conflicts:
	server/src/main/java/org/activityinfo/i18n/shared/UiConstants.java