First Commit
Merge branch 'master' of github.com:rkewley/DataAppGenerator

Conflicts:
	DataAppGenerator/.classpath
Partial changes to enable Slick data integration