Date Picker + Template
Merge branch 'master' of https://github.com/serut/vieassociative

Conflicts:
	public/css/compiled.css
	public/js/vendor/bootstrap-datetimepicker.min.js
	public/js/vendor/datepicker.js