Modified to start using materials, added the
database files so that we can share those.

Karl
Merge branch 'master' of https://github.com/ahrekar/Simplicity

Conflicts:
	grails-app/domain/simplicity/Assignment.groovy