Merge remote-tracking branch 'origin/master'

Conflicts:
	com.semeureka.fault/src/main/java/com/semeureka/fault/controller/MinaController.java
	com.semeureka.fault/src/main/webapp/WEB-INF/view/mina/mina.jsp