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

Conflicts:
	res/css/journal.less
- tinymce add
- bugfix datapicker