Moved fuel log template to it's own template file
Merge remote-tracking branch 'origin/master'