Issue 506 fixing bugs and conflicts with master
Issue 506 fixing snippet bugs while adding or editing problem