add id dikti di prodis
Merge branches 'master' and 'surveyalumni'
Merge branch 'master' of https://github.com/glendkampuskoit/kampuskoit

Conflicts:
	db/schema.rb