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>
Update task_show_item_template.html
Update browse_main_view.js
Update tag_show_template.html
text changes

Signed-off-by: Bo Bao <yourztrulybao@gmail.com>
Merge pull request #2 from jhinton/patch-2

Update task_show_item_template.html
Merge pull request #3 from jhinton/patch-3

Update browse_main_view.js
Merge pull request #4 from jhinton/patch-4

Update tag_show_template.html
Merge branch 'master' of https://github.com/eGT-Labs/midas into hhs-text

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

Conflicts:
	assets/js/backbone/apps/tasks/show/templates/task_show_item_template.html
updated about

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

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

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