Merged latest AddQuestion changes.At least I hope so!
Conflicts solved.Fresh version is ready ;)