Merge pull request #4 from OctoFalcon/master

Merge into alffrey/astrid from OctoFalcon/astrid on Sept 5, 2014
Merge pull request #5 from OctoFalcon/master

Merge into alffrey/astrid Sept 5, 2014
Merge pull request #6 from OctoFalcon/master

Merge into local repo
Merge pull request #7 from OctoFalcon/master

Merge into alffrey/astrid
Corrected the datasource for getCategoryByParent
Merge pull request #16 from alffrey/master

Merge into OctoFalcon/astrid