Added token functions

This fixes #50
OAI fix

This fixes #130
FCKeditor change to CKeditor

Fixes #131
Fixed problem with adding numismatic data

Fixes #112
General changes to code base

Cosmetic stuff