Fix theme
System form template update
Merge pull request #771 from voltan/develop

Fix theme
Merge pull request #773 from sexnothing/develop

System form template update
Merge branch 'develop' into media
Formulated message display for form submission
Formulated message display for form submission
Merge branch 'develop' into media