changed elastic search model to do multi field tokenizer
Merge branch 'dev' of github.com:ndoit/muninn into dev
added special case code for augie's role (before we get integrated with roles in sql server
Merge branch 'dev'