Merge branch 'sprint9' of https://github.com/eGT-Labs/midas
Merge branch 'master' of https://github.com/eGT-Labs/midas
Merge branch 'hhs-text' of https://github.com/eGT-Labs/midas
Merge branch 'hhs-text' of https://github.com/eGT-Labs/midas
updated nav template

Signed-off-by: Bo Bao <yourztrulybao@gmail.com>