init
merge
fix merge
Merge branch 'master' of https://github.com/agustincl/timeback
fix merge
Pa casa
fix merge
fix merge
Merge pull request #5 from paznar/master

data type json
Merge branch 'master' of https://github.com/agustincl/timeback
Updated
merge
CORS added
fixed patch/update
GetOne Timeline
Merge branch 'master' of https://github.com/nakasoft/timeback
Timeline getOne method
Complete last functions/methods
fix var name
reorganice tabs