Progress commit
Merge branch 'master'

Conflicts:
	frontend/app/scripts/modules/uql.journals/controllers/journals.js
	frontend/app/scripts/modules/uql.journals/directive.js