added db locking of answers
Removed page loading in answer view
commiting master