Excluding slf4j from the list of bundled jars
Merge pull request #80 from thewheat/large-concept-descriptions

Large concept descriptions
Merge pull request #87 from cathy-mcdonald/submit_no_concepts

Prevent submission if no concepts added
Conflicts:
	conceptpropose/omod/src/main/webapp/resources/js/controllers/EditProposalCtrl.js
Resolved by Timothy Lim <tim@thewheatfield.org>
Merge pull request #95 from thewheat/restore-missing-merges

Restore missing merges