make me commit log files
committing merge
Commiting db
fixing merge errors
Changed layout to include the hub link
commiting all the cache stuff..