Merge branch 'hotfix/20140122-travis'
Remove DataStorage
Merge branch 'hotfix/20140122-issue-95' into develop