pulling changes
Merge branch 'development' of github.com:railskipl/drive into development
design integration on user blogs and logbooks
conflict removed from schema
block unblock display
Merge branch 'development' of github.com:railskipl/drive into development
changes
Merge branch 'development'