addind IF
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/ru/onyx/clipper/model/ReportTable.java
addind <if> inside <cell>
Merge remote-tracking branch 'origin/master'