Merge branch 'release-2014.04.14'
Merge branch 'release-2014.04.21'
bumped version number to 2014.04.21.1
fixed html doctype and content-type errors
Merge branch 'hotfix-2014.04.21.1' into develop