Adding graphite
Merge branch 'graphite'

Conflicts:
	.gitmodules