Grid fed from REST service
Merge branch 'master' of https://github.com/cah-geraldallison/test

Conflicts:
	KillerWebApp/WebContent/WEB-INF/classes/.gitignore
	KillerWebApp/src/com/cardinal/ws/rest/resource/DataResource.java