bug fixes 11-12-13
Merge branch 'development' of github.com:railskipl/drive into development