jiraId:MAR-5854 merge
jiraId:MAR-5854 merge
jiraID:MAR-4544 init create scenario
jiraID:MAR-4544 init create scenario
Merge branch 'newDesign' of ssh://git.marketshare.com:7999/des/ms360uiux into newDesign
jiraID:MAR-4544 merge clean up
jiraID:MAR-4544 cleanup create scenario js
jiraID:MAR-4544 Merge branch 'develop' into newDesign

Conflicts:
	ThreeSixtyOneView/app/scripts/controllers/main.js
jiraID:MAR-4544 Merge branch 'develop' into newDesign
jiraId:MAR-542 refactor
Merge branch 'develop' of ssh://git.marketshare.com:7999/des/ms360uiux into develop
jiraId:MAR-6123 :: Integrated ngdocs (using grunt-ngdocs) with code base. Use grunt serve or build to generate.
jiraId:MAR-542 :: Updates to remove doc server from auto-start on grunt serve. To start doc server, use grunt serve:docs or grunt build.
Update for Disqus integration.
Minor update removing spec from path for test files (since we're not using that naming convention).
Removed docs from build task.
jiraID:MAR-4544 merge
merge
fixed gruntjs
jiraId:MAR-6208