Ticket #268 - potential fix to whitespace issues
Merge branch 'whitespave' of github.com:Gankro/EpicEditor into whitespave

Conflicts:
	epiceditor/js/epiceditor.min.js
Merge branch 'develop' into whitespave