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>
Remove cache: true from proposals angular service
Merge pull request #95 from thewheat/restore-missing-merges

Restore missing merges
Merge pull request #96 from thewheat/fix-chrome-angular-error

Remove cache: true from proposals angular service. Get Proposals working in Chrome
Needed for OSX Yosemite and Firefox 32
Merge pull request #97 from thewheat/update-selenium-dependency

Update selenium version
Ensure concept is added before submission
Update css selector to correctly identify number of concepts
Use env/config for credentials on settings page
Merge pull request #99 from thewheat/delete-concept-functional-test

Update css selector to correctly identify number of concepts
Merge pull request #98 from thewheat/submit-proposal-functional-test

Ensure concept is added before submission
Merge pull request #100 from thewheat/settings-page-use-env-vars

Use env/config for credentials on settings page (allow CI to use env variables for settings page)
Update to select concept properly
Merge pull request #101 from thewheat/review-concept-decision

Update functional test to select concepts properly
Update review comments functional test to support discussions
Merge pull request #102 from thewheat/review-comments-functional-test

Update review comments functional test to support discussions
Move QueryBrowserPage to common and fix URL if using environment variables
Merge pull request #103 from thewheat/consolidate-and-fix-querybrowser

Move QueryBrowserPage to common and fix URL if using env variables