Merge pull request #1 from iandavidwild/develop

Develop - merge develop into master
Merge branch 'develop'
Merge pull request #22 from iandavidwild/master

Master - merge test/release1.6 into master
Merge branch 'develop'

Tidying up because it appears work on the develop branch was deployed
but never merged back into master.
Merge remote-tracking branch 'origin/develop' - Qmplus release 2014-3
Merge branch 'develop'
More fixes. Changed revision number
Code documentation and formatting
merge with master with edit_form.php re-added