join buttons added
Merge remote-tracking branch 'origin/master'

Conflicts:
	Sith_Web_Application/src/main/webapp/home.jsp
join buttons added