added some new functions in the conroller
Merge branch 'master' of https://github.com/dcmonger/meetnauw
added edit controller, added edit model, made some buttons work