ole2: cleaned-up commented code
json: added unique identifier for root filetype (RootFileType)
ooxml: moved value parsing into separate function
ooxml: cleaned up comments
ooxml: restructured code for continued parsing after excedding rlvl limit
ooxml: report hitting recursion limit to json
Merge branch 'master' of git.clam.sourcefire.com:/var/lib/git/clamav-devel