pulling changes
Merge branch 'development' of github.com:railskipl/drive into development
design integration on logbooks
conflicts removed