Merge remote-tracking branch 'origin/master'

Conflicts:
	src/edu/uci/ics/sdcl/firefly/servlet/SkillTestServlet.java
	src/edu/uci/ics/sdcl/firefly/servlet/UserIdServlet.java
Merge branch 'master' of https://github.com/christianadriano/crowd-debug-firefly

Conflicts:
	src/edu/uci/ics/sdcl/firefly/servlet/SkillTestServlet.java