Merge pull request #2 from OctoFalcon/master

Merge pull request #1 from alffrey/master
Custom logic added to category model
Dependency added
Merge pull request #3 from adikampli/master

Dependency added
Merge pull request #3 from OctoFalcon/master

Merge from OctoFalcon/astrid:master to alffrey/astrid:master on Sept 3, 2014
Dependency Added

Added dependency for "async" module .
Changes to wcsCategoryDS
Changes to child-category model

Added a property "subCategoryNames" to hold the names of the
subcategories in that category.
Added custom logic to fetch Navbar
Merge branch 'master' of https://github.com/alffrey/astrid

Conflicts:
	package.json
Merge pull request #4 from alffrey/master

Merge request from alffrey/astrid to OctoFalcon/astrid on Sept 3, 2014
Merge pull request #2 from OctoFalcon/master

Merge on 4 sep