Added demo builder into SpannersTest
Revert to before failed merge
Merge branch 'builder_demo'

Conflicts:
	spanners-dao/src/test/java/org/dontpanic/spanners/dao/SpannersDAOTest.java