AI-519 : cell table affix
Merge remote-tracking branch 'origin/version3' into version3

Conflicts:
	server/src/main/java/org/activityinfo/ui/client/widget/LoadingPanel.java