Локальный
Локальный
Merge branch 'master' of https://github.com/ikharlampenkov/bungur

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.kbict/bungur/pom.properties