Merge branch 'michaelsdev'
Merge branch 'michaelsdev'
Merge pull request #1 from jehope/development

Development branch merge
Merge pull request #3 from jehope/development

Development
Merge pull request #18 from jehope/jehUpdates9Dec13

Jeh updates 9 dec13
Merge branch 'master' of https://github.com/jehope/dhpress
Merge pull request #20 from jehope/development

Merge pull request #19 from jehope/jehUpdates9Dec13
Merge pull request #22 from jehope/development

Development merge
Merge pull request #24 from jehope/development

Development
Merge pull request #25 from jehope/master

Sync dev with master