hi
Merge branch 'master' of https://github.com/CodingBliss/WhiteElephant

Conflicts:
	persist/SQLSaver.java
	persist/Saver.java