update
Merge branch 'master' of https://github.com/sjoynt/shelbi.git

Conflicts:
	com.shelbi.main/.classpath