issue #31 edit hall.json

comment HallDaoImplTest.java and TablesDaoImplTest.java
change size screen 1280*800
issue #31 edit hall.json
fix AbstractDaoImplTest.java
Merge branch 'issue_31_colya'
issue #35 tables name display
issue #35 we can change size, color, style and location of text
issue #35 add comments
Merge branch 'issue_35_display_table_name'
Returned postgreSQL settings
Merge branch 'issue_33_config_to_webcash'

resolved conflicts:
	webcash-domain/src/test/java/com/siriusif/service/model/AbstractDaoImplTest.java
	webcash-domain/src/test/java/com/siriusif/service/model/HallDaoImplTest.java
[Issue #33] Added database configuration description
[Issue #34] Implemented draft solution
Merge branch 'issue_34_load_sample_data_to_db' into demo

Resolved conflicts:
	webcash/src/main/resources/webcash-database.properties