REST Framework choice
Merge branch 'master' of github.com:tnc-ba/doku

Conflicts:
	chapters/strongTNC_api.tex
Merge branch 'master' of github.com:tnc-ba/doku

Conflicts:
	chapters/strongTNC_api.tex
Browsable API