Change timepicker logic to use locale specific meridiem string rather than am/pm
Merge branch 'master' of github.com:nikoskalogridis/bootstrap-datetimepicker

Conflicts:
	src/js/bootstrap-datetimepicker.js