Fixed source files according to Google Style Guide
logs removed
dump.rdb removed
Solved merge with aspects