changed config
Merge branch 'changes' into development
wtforming and broken test