commit before merging the new code from cf version
syncing functions and queries on Railo with CF version