2014-09-24 16:58:37
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/WEB-INF/pages/index.jsp