WYSIWYG editor added
designintegration
merge conflicts removed
gemlock file
Merge branch 'development' of github.com:railskipl/drive into development
Merge branch 'development'