Merge branch 'develop'
Added 404 & 500 Error Templates. Bumped Version Number
Merge branch 'hotfix-1.1' into develop