Update EventDAOTest.java
Merge branch 'gui'
Merge branch 'master' of https://github.com/Bugeda/stadiumticket
change db.sql, add resource for create_drop db
fix 'delete-captcha' bug
Merge branch 'BGlex'
fix incorrect read/write cp1251 symbols from/in the db
Merge pull request #15 from Bugeda/BGlex

fix incorrect read/write cp1251 symbols from/in the db
Merge pull request #16 from Bugeda/gui

Gui
add basic locale
My login and pass for local db
Integration
Seats status request
Merge branch 'master' into BGlex

Conflicts:
	src/main/resources/db.sql
Merge branch 'BGlex'
Merge branch 'master' of https://github.com/Bugeda/stadiumticket
Merge pull request #18 from Bugeda/sellTickets

Sell tickets
sell tickets-locale
Merge pull request #19 from Bugeda/BGlex

sell tickets-locale
Delete sell_tickets.jsp