Merge pull request #243 from pdewouters/master

reverting 2 commits and adding a property to the services
added nonce check to all ajax post actions
replace all calls to exit with die for consistency
removed unnecessary lines and did some formatting
Merge branch 'nonces'