buttons
Merge pull request #27 from Wuisch/document

buttons
delete method
buttons
Merge pull request #28 from Wuisch/document

Document
Merge branch 'master' into dirk

Conflicts:
	app/routes.php