check in .classpath and .project files
Merge remote-tracking branch 'hdao/master'

Conflicts:
	Unbearable/.classpath
	Unbearable/.project
	UnbearableModelClasses/.project
	UnbearableWebService/.classpath