security
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/WEB-INF/view/smsettings.jsp
	src/main/webapp/home.jsp
Merge remote-tracking branch 'origin/master'
security