Action log & Notification modules
Merge branch 'origin/devel'

Conflicts:
	install/examples/demosrc/mysql/cb_demosrc-20140604.sql