Small updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	TTA-WEBAPP/src/main/webapp/WEB-INF/resources/includes/custom.css