Merge branch 'database' of github.com:utwente-di/di18 into frontend
Ajax parameters preserved
Merge branch 'frontend' of github.com:utwente-di/di18 into frontend
Merge branch 'database' of github.com:utwente-di/di18 into frontend
Merge branch 'database' of github.com:utwente-di/di18 into frontend
Merge branch 'database' of github.com:utwente-di/di18 into frontend
Merge branch 'database' of github.com:utwente-di/di18 into frontend
koekjes
Fields of study reveal
Merge branch 'frontend' of github.com:utwente-di/di18 into frontend
Merge branch 'frontend' of github.com:utwente-di/di18

Conflicts:
	ThinkTank/src/main/webapp/files/Thumbs.db
	ThinkTank/src/main/webapp/images/Thumbs.db
no longer Thumbs.db