Merge branch 'optional-logging'
Merge branch 'master' of github.com:fbrnc/Aoe_Profiler
Added database query count to output.
Added number of database queries if db profiling is enabled (Thanks to Matthias Zeis)