test12
Merge branch 'master' of https://github.com/Ehheee/thething

Conflicts:
	src/main/java/thething/one/dbmapping/ThingDao.java
	target/classes/thething/one/dataobjects/Photo.class
	target/classes/thething/one/dbmapping/ThingDao.class