ticket:6 fix ajax and settings
Merge branch 'ticket_6'