Merge pull request #139 from existdissolve/development

CONTENTBOX-130: Replaced uploadify brokenness with manual upload field #resolve
Typo
CONTENTBOX-504
CONTENTBOX-25 #close
CONTENTBOX-508
Automated build process