Merge branch 'master' of https://github.com/eternicode/bootstrap-datepicker

Conflicts:
	js/bootstrap-datepicker.js
Merge branch 'master' of https://github.com/koppelbakje/bootstrap-datepicker

Conflicts:
	js/bootstrap-datepicker.js