Added display data
Corrected fixed caps
Merge branch 'BETA' of https://github.com/uc-pkm/testing.git into BETA

Conflicts:
	index.php
Merge pull request #10 from uc-pkm/BETA

Beta