?
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.classpath
fix crazy stuff
delete classpath
minor modification for tv answer mapper
Merge branch 'develop' of http://10.3.9.238/qa/rubyweb into develop
update for aiml answer
loading effect
Merge branch 'develop' of 10.3.9.238:qa/rubyweb into develop
add inputType to analytic