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
add field to token
Merge branch 'master' of github.com:jordenh/DE2VTT into token-structure
changes to the token activity view
Merge branch 'token-structure' of https://github.com/jordenh/DE2VTT into tokenMoveView
tokens added to view when added
fixed up token settings layout and saved changes
more changes to token settings layout
Merge pull request #5 from jordenh/tokenMoveView

Token move view merged
pulling in changes from master