inbox.jsp update
inbox.css update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ideating/src/main/webapp/css/inbox.css
	Ideating/src/main/webapp/inbox.jsp