Merge pull request #111 from gavia/master

Fixed the javascript tests
Consolidate refresh into single button
Merge pull request #112 from gavia/master

Updated commenting
Merge upstream changes
Merge pull request #113 from thewheat/single-refresh

Single refresh button
Tab fixing
Merge remote-tracking branch 'upstream/master'

Conflicts:
	conceptpropose/omod/src/main/webapp/resources/partials/EditProposal.html