add support for new waffles upload page
Merge branch 'develop'