update bootstrap to 3.2.0
add kind
Merge remote-tracking branch 'origin/master'

Conflicts:
	models/sirenModel.js