- new journal
Merge remote-tracking branch 'origin/dev2' into dev2

Conflicts:
	templates/layout/newjournal.php
Merge remote-tracking branch 'origin/dev2' into dev2

Conflicts:
	templates/layout/newjournal.php
Merge remote-tracking branch 'origin/dev2' into dev2

Conflicts:
	templates/layout/newjournal.php
 Datepicker

edited files:

- default.php
- newjournal.php

new directorys:

- test
- test-datetimepicker
Merge remote-tracking branch 'origin/dev2' into dev2