Changed the API signature to be a bit more RESTful
Merge https://github.com/Liliyagoodgirl/SomaCMS into Liliyagoodgirl-2bc8126

Conflicts:
	src/main/java/fi/essentia/somacms/controllers/AdminController.java
nicEditor
Merge branch 'master' of https://github.com/mhalttu/SomaCMS