slim rest api committed from netbeans
Merge origin/master