Change Conviction Attributes
Merge branch 'origin/master'

Conflicts:
	IntroDBProject/src/ch/ethz/inf/dbproject/model/DatastoreInterface.java