Merge branch 'master' of https://github.com/jordenh/DE2VTT into tokenMoveView
button handler for settings view
merge changes in from master
token settings buttons working
merging chages from master
fixed includes in moveTokenFragment
Merge pull request #4 from jordenh/tokenMoveView

Token move view merged
merged from master