Last Updates

Lorenzo
Merge branch 'master' of https://github.com/hmuni006/coplat

Conflicts:
	.idea/workspace.xml
	themes/bootstrap/views/site/index.php