Little bit of refactoring
Final checkin
Final commit for the up and running local experts application.
Merge branch 'master' of https://github.com/hbarthwal/infolab

Merging code with Sumaniya's branch.
Resolved Conflicts