Merge pull request #536 from paczian/master

base template and upload page validation
Merge pull request #537 from paczian/master

fixed quotation error in heatmap