Changed:
UserID is no longer displays when a capcode is used
Little change in functions.php to make marking up working
minor modifications
Merge branch 'master' into basic-changes