New tests.
Merge branch 'master' of https://github.com/tetek/graffiti

Conflicts:
	server/graffiti_server/graffiti_server/contentprovider/models.py