annoying prompt removed, all actions are reversible so no worries
Merge branch 'develop' into postgres