New files checked...
New revsion of files due to check style
New changes in the style of the rest-api
Fix conflicts from 3cee29