a
Merge branch 'master' of https://github.com/jarmstrong001/athloneitf2

Conflicts:
	athloneitf2/conf/hibernate.cfg.xml
	athloneitf2/src/com/athloneitf/ui/ClassSelectDialog.java