aa
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	CupolineW/src/main/java/com/spring/app/controllers/HomeController.java
	CupolineW/src/main/java/com/spring/app/controllers/ServicePublicController.java
	CupolineW/src/main/resources/sdk_config.properties
	CupolineW/src/main/webapp/WEB-INF/tags/captcha.tag
	CupolineW/src/main/webapp/WEB-INF/views/public/home.jsp
	CupolineW/src/main/webapp/js/javascript.js