Merge branch 'release/2.4.0.1' into develop
Migrated to active record pattern #674
Merge pull request #10 from prakashpp/feature/task-674

Migrated to active record pattern #674
Add .travis.yml for unit testing
Release version 2.6.0.1
Merge branch 'release/2.6.0.1'
Merge branch 'release/2.6.0.1' into develop
Merge branch 'develop' of github.com:openlabs/nereid-cms into develop
Added tests for depends and views and mutiple fixes to depends in models
Bump version to 2.6.0.2dev
Merge branch 'develop' of github.com:shalabhaggarwal/nereid-cms into develop
Merge pull request #13 from shalabhaggarwal/develop

Added tests for depends and views and mutiple fixes to depends in models
Removve unused field from view
Fix migration issue, self in used in a class method 'sitemap_index' #2107

* Removed self from classmethod, added a test

Task ID: project-7/task-2107
Merge pull request #14 from simmianand/feature/task-2107

self is removed from class method 'sitemap_index' in cms.py #2107
nereid.cms.article.category Model has no attribute 'uri' #2129

* This patch has replaced 'uri' with 'unique_name' as there is no self
  attribute 'uri' in nereid.cms.article model.

Task ID: project-7/task-2129
Issue ID: 299003
Merge pull request #16 from simmianand/feature/task-2129

nereid.cms.article.category Model has no attribute 'uri' #2129
Release version 2.6.0.2
Merge branch 'release/2.6.0.2'
Merge branch 'release/2.6.0.2' into develop