AI-438 : added expression to indicator definition
resolve file name conficts (022->023)
AI-438 : added expression to indicator definition
#
# It looks like you may be committing a cherry-pick.
# If this is not correct, please remove the file
#	.git/CHERRY_PICK_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch version4
# Changes to be committed:
#
#	modified:   server/src/main/java/org/activityinfo/core/shared/expr/ExprParser.java
#	new file:   server/src/main/java/org/activityinfo/core/shared/table/TableColumnData.java
#	modified:   server/src/main/java/org/activityinfo/i18n/shared/UiConstants.java
#	modified:   server/src/main/java/org/activityinfo/legacy/shared/impl/GetSchemaHandler.java
#	modified:   server/src/main/java/org/activityinfo/legacy/shared/impl/GetSitesHandler.java
#	modified:   server/src/main/java/org/activityinfo/legacy/shared/model/IndicatorDTO.java
#	modified:   server/src/main/java/org/activityinfo/server/command/handler/BaseEntityHandler.java
#	modified:   server/src/main/java/org/activityinfo/server/database/hibernate/entity/Indicator.java
#	modified:   server/src/main/java/org/activityinfo/server/report/generator/MapGenerator.java
#	modified:   server/src/main/java/org/activityinfo/ui/client/page/config/design/IndicatorForm.java
#	modified:   server/src/main/java/org/activityinfo/ui/client/page/entry/form/IndicatorSection.java
#	new file:   server/src/main/resources/org/activityinfo/database/changelog/db.changelog-023-calculated-indicators.xml
#	modified:   server/src/main/resources/org/activityinfo/database/changelog/db.changelog-master.xml
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   server/src/main/resources/org/activityinfo/database/changelog/db.changelog-023-calculated-indicators.xml
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	datamodel/
#	geoadmin/target/
#	mvn-ox.bat
#	server.zip
#	server/target/
#	server/war/
#	settings.xml