Служебный
Merge branch 'master' of https://github.com/ikharlampenkov/bungur

Conflicts:
	index.html
	src/main/webapp/WEB-INF/views/atmosphere/explosionarchive/index.jspx
	src/main/webapp/WEB-INF/views/atmosphere/situation/index.jspx
	src/main/webapp/WEB-INF/views/model/explosion/index.jspx
	target/m2e-wtp/web-resources/META-INF/maven/com.kbict/bungur/pom.properties
Название участка в атмосфере