43
Merge branch 'master' of https://github.com/malyanov/sms_firewall_server

Conflicts:
	pom.xml
	src/main/java/com/quazar/sms_firewall/beans/BugBean.java
	src/main/java/com/quazar/sms_firewall/controlles/BugController.java
	src/main/java/com/quazar/sms_firewall/entities/Bug.java