updates
Merge branch 'master' of https://github.com/samindaa/dialog_agent_flairs_2014