Updated merge between cookies and ids of variables
Merge branch 'master' of https://github.com/saldarriaga/102_kerry
Updated Api and Presentations model
Merge branch 'master' of https://github.com/saldarriaga/102_kerry
Updated Technolies model
Merge branch 'master' of https://github.com/saldarriaga/102_kerry
updated technology admin
Merge branch 'master' of https://github.com/saldarriaga/102_kerry

Conflicts:
	themes/bootstrap/views/technology/admin.php