Removed superfluous file tokens.h
Tidied up some whitespace Removed the use of std:: throughout main.cpp and generator.cpp
Added the 'flags' attribute
Merge branch 'dev'
Merge branch 'dev'