Merge pull request #28 from alim/development

Development - Merge latest development branch for Issue #26
Merge pull request #32 from alim/development

Development - Merge latest development branch for Issue #29
Merge pull request #34 from alim/development

Development - Merge latest development branch for Issue #26
Merge pull request #36 from alim/development

Development - Merge latest development branch
Merge pull request #41 from alim/development

Development - Merge latest development branch for Issue #37
Merge pull request #44 from alim/development

Development - Merge latest development branch for Issue #42
Issue #42 - Updated Macrophage controller spec to use actual macrophage record id
Merge pull request #45 from alim/Issue_42

Issue 42 - Updates for centralizing and refactor menu highlighting.