ignore extension development
extension update
Merge remote-tracking branch 'upstream/master'
Cleaned up simpleforms