action edit test added
Merge branch 'master' into test
done resolve
rest controller tested
Merge pull request #4 from Kreees/test

Testing for REST controller