add trello
resolve conflict
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade into elance
remove 'fs' module from package.json as npm does not work
update locales README.md
trello to chapters.json
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade into elance
fix trello chapter.json list generation
Merge branch 'master' into dev
before merge
merge
getCards when 1st CPU core starts, check is data onJSON or not
comparing old&new JSON, PARSE_INTERVAL in ./config/config
upd
update the .gitignore as data/chapters.json is now generated from the app
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade into dev
fix the czech json file and update the language select
chapters.json update
push to zmgc/dev
testing git push for chapter.json