Fixed collectionView controller loading of table data
Merge origin/master

Conflicts:
	src/com/jjlcollectors/controllers/CollectionViewController.java