Merge pull request #1 from ZolnaiDani/master

Added lessons, finished courses
Merge pull request #3 from ijansch/master

Roosters en enkele wijzigingen
Course get normal identifier
Courses and Minors definition
remove explicit enumeration of default field
Testresult and Courseresult
Merge branch 'master' of github.com:baszoetekouw/OpenOnderwijsAPI

Conflicts:
	api/fixtures/initial_data.json
	api/models.py
	api/serializers.py
	api/urls.py
	api/views.py
Merge branch 'master' of github.com:baszoetekouw/OpenOnderwijsAPI

Conflicts:
	api/fixtures/initial_data.json
	api/models.py
	api/serializers.py
	api/urls.py
	api/views.py
Removed spurious .pyc file
Merge remote-tracking branch 'upstream/master'

Conflicts:
	api/fixtures/initial_data.json
	api/models.py
	api/serializers.py
	api/urls.py
	api/views.py
Fixed json conflicts.