-fix
Merge branch 'master' of
git@github.com:smartcampuslab/smartcampus.mediation.git

Conflicts:
	src/main/webapp/WEB-INF/jsp/index.jsp