disable support for the new Waffles upload page temporarily
bump version number to 1.2.1
Merge branch 'develop'