Fixed doxygen madness!
Merge branch 'dev' of github.com:Gazok/Tank into dev