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

Conflicts:
	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