Merge branch 'release/1.4-moorfields' into develop
Merge branch 'develop' of github.com:openeyes/OphTrOperationnote into develop
Merge branch 'develop' of github.com:openeyes/OphTrOperationnote into develop
Merge branch 'release/1.4' into develop
Merge branch 'release/1.4' into develop
[OE-3217] initial work on refactoring opnote to get rid of the 100s of tables, mostly there just need to figure out how to post the generic element more than once.
Merge branch 'release/1.4' into develop
[OE-3217] removed the unnecessary tables in opnote.
Merge branch 'jira/3217' into develop
Merge branch 'release/1.4' into develop

Conflicts:
	assets/js/module.js
Merge branch 'release/1.4' into develop
Merge branch 'release/1.4' into develop
bugfix - table name has changed
migration bugfix
Merge branch 'master' into develop
Added base grunt and sass files
[OE-3276] new api method + hidden field fix
[OE-3276] hidden field fix
[OE-3274] last opnote eye api
Added base styles