Merge branch 'master' of https://github.com/agustincl/F-for-timeline
Merge branch 'master' of https://github.com/agustincl/F-for-timeline
Merge branch 'master' of https://github.com/agustincl/F-for-timeline
Implemented update method
Merge branch 'master' of https://github.com/agustincl/F-for-timeline

Conflicts:
	config/autoload/application.global.php
	modules/Application/src/Application/Services/Timelines.php
	modules/Application/src/Application/controllers/Timelines.php
	modules/Application/src/Application/mapper/Timelines.php
json con controller
Merge branch 'master' of https://github.com/agustincl/F-for-timeline

Conflicts:
	modules/Application/src/Application/controllers/Timelines.php
Merge branch 'master' of https://github.com/viktorKhan/F-for-timeline

Conflicts:
	modules/Application/src/Application/controllers/Timelines.php