53 vrp conflict updates

- fixes conflicts with the vrp plugin
- additional functionality to process token within a token
#5 initial updates
#5 added scrolling
#5 update errors and redirects
Merge branch 'master' into 5easyedit
#5 easy edit

- fixed bug when saving tokens
#easy edit removed add new token sub menu
add hardcoded tokens #8

- added `%wptm_domain%` domain token
add hardcoded tokens #8

leave www. on the domain name
53 vrp conflict

fixes with displaying token contents with backslashes, that causes
issue with displaying the tokens.
#5 easy edit

- add new box on top of the token list
- sort by ID by default
- popup / success message after save
- allow dashes and underscores
Merge pull request #7 from deanearlbartolabac/5easyedit

5easyedit
Merge branch 'master' into 8add-hardcoded-tokens
added site url, update domain token
Merge pull request #9 from deanearlbartolabac/8add-hardcoded-tokens

add hardcoded tokens #8
Merge branch 'master' into 53vrpconflict

Conflicts:
	wp-token-manager.php
53 vrp conflict updates

- merged 5 easy edit
- code adjustments
Merge pull request #6 from deanearlbartolabac/53vrpconflict

53 vrp conflict updates
bump version to 0.8.0