#10 DateTimepicker scripts changed
Merge branch 'calendar' into Development

Conflicts:
	app/views/layout/master.blade.php