地图弹框改为Ifarme。
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules.urgent/majorhazardsource/majorhazardsource-webapp-wicket/src/main/java/com/daren/majorhazardsource/webapp/wicket/page/MapPage.java
	modules.urgent/majorhazardsource/majorhazardsource-webapp-wicket/src/main/resources/com/daren/majorhazardsource/webapp/wicket/page/MapPage.html
地图弹框改为Ifarme。
Merge remote-tracking branch 'origin/master'