[OEM-212] bugfix for opnote crash
[OEM-212] fixed broken foreign key constraint
[OEM-212] uncommented line
Merge branch 'jira/OEM-212' into release/1.7

Conflicts:
	migrations/m140812_111740_fix_db_schema.php
Update RELEASE notes
Merge remote branch 'origin/master' into jira/OEM-169