introduced backlogMode
merged conflicting files
fixed conflicting files
Merge branch 'master' of https://github.com/agilo-boards/agilo-boards